diff --git a/stepmania/src/GameLoop.cpp b/stepmania/src/GameLoop.cpp
index d72c821921..b8e280f60f 100644
--- a/stepmania/src/GameLoop.cpp
+++ b/stepmania/src/GameLoop.cpp
@@ -101,6 +101,7 @@ void GameLoop()
 
 		if( INPUTMAN->DevicesChanged() )
 		{
+			INPUTFILTER->Reset();	// fix "buttons stuck" if button held while unplugged
 			INPUTMAN->LoadDrivers();
 			CString sMessage;
 			if( INPUTMAPPER->CheckForChangedInputDevicesAndRemap(sMessage) )