diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 0f66178b..3e79b418 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -5490,6 +5490,9 @@ CMenuManager::SwitchMenuOnAndOff()
 				}
 				Initialise();
 				LoadAllTextures();
+#ifdef FIX_BUGS
+				CPad::StopPadsShaking();
+#endif
 			} else {
 #ifdef EXTENDED_COLOURFILTER
 				// we always expect CPostFX to be open