diff --git a/source/pad/vibe.cpp b/source/pad/vibe.cpp
index a4730842c..52677e621 100644
--- a/source/pad/vibe.cpp
+++ b/source/pad/vibe.cpp
@@ -74,16 +74,7 @@ u8										CPadVibrationManager::s_currentIntensityValues[2];
   ---------------------------------------------------------------------- */
 void	CPadVibrationManager::init()
 {
-	int		i,j;
-
-	for(i=0;i<2;i++)
-	{
-		for(j=0;j<MAX_VIBES_PER_PAD;j++)
-		{
-			s_vibeControls[i][j].m_active=false;
-		}
-		s_currentIntensityValues[i]=0;
-	}
+	stopAllVibration();
 }
 
 /*----------------------------------------------------------------------
@@ -177,5 +168,25 @@ void	CPadVibrationManager::setVibration(int _port,VIBE_TYPE _type,u8 _ferocity)
 	vc->m_ferocity=_ferocity;
 }
 
+/*----------------------------------------------------------------------
+	Function:
+	Purpose:
+	Params:
+	Returns:
+  ---------------------------------------------------------------------- */
+void	CPadVibrationManager::stopAllVibration()
+{
+	int		i,j;
+
+	for(i=0;i<2;i++)
+	{
+		for(j=0;j<MAX_VIBES_PER_PAD;j++)
+		{
+			s_vibeControls[i][j].m_active=false;
+		}
+		s_currentIntensityValues[i]=0;
+	}
+}
+
 /*===========================================================================
  end */
\ No newline at end of file
diff --git a/source/pad/vibe.h b/source/pad/vibe.h
index c8b29a391..8d97c2de5 100644
--- a/source/pad/vibe.h
+++ b/source/pad/vibe.h
@@ -54,6 +54,8 @@ public:
 	static void				setVibration(int _port,VIBE_TYPE _type,u8 _ferocity=255);
 	static u8				getCurrentVibrationIntensity(int _port)			{return s_currentIntensityValues[_port];}
 
+	static void				stopAllVibration();
+
 private:
 	enum
 	{
diff --git a/source/system/gstate.cpp b/source/system/gstate.cpp
index 750087020..ce590055a 100644
--- a/source/system/gstate.cpp
+++ b/source/system/gstate.cpp
@@ -23,6 +23,13 @@
 #include "system\vid.h"
 #endif
 
+#ifndef __PAD_PADS_H__
+#include "pad\pads.h"
+#endif
+
+#ifndef	__PAD_VIBE_H__
+#include "pad\vibe.h"
+#endif
 
 
 /*****************************************************************************/
@@ -89,6 +96,8 @@ void GameState::think()
 #endif
 				ASSERT(s_pendingScene);		// There really should be a scene pending before you shutdown..!
 				s_currentScene->shutdown();
+				CPadVibrationManager::stopAllVibration();
+				PadUpdate();
 #ifdef __VERSION_DEBUG__
 				int loss;
 				loss=MainRam.RamUsed-s_baseMemory;