diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 9c6d6f24..7d378e7f 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -5696,6 +5696,9 @@ CMenuManager::SwitchMenuOnAndOff()
 		|| m_bShutDownFrontEndRequested || m_bStartUpFrontEndRequested) {
 
 		m_bMenuActive = !m_bMenuActive;
+#ifdef FIX_BUGS
+		CPad::StopPadsShaking();
+#endif
 
 		if (m_bShutDownFrontEndRequested)
 			m_bMenuActive = false;