diff --git a/stepmania/src/InputFilter.cpp b/stepmania/src/InputFilter.cpp
index 523ef496f6..6bc8d027bc 100644
--- a/stepmania/src/InputFilter.cpp
+++ b/stepmania/src/InputFilter.cpp
@@ -37,6 +37,8 @@ void InputFilter::ButtonPressed( DeviceInput di, bool Down )
 	m_fSecsHeld[di.device][di.button] = 0;
 
 	InputEventType iet = Down? IET_FIRST_PRESS:IET_RELEASE;
+
+	LockMut(queuemutex);
 	queue.push_back( InputEvent(di,iet) );
 }
 
@@ -51,6 +53,10 @@ void InputFilter::Update(float fDeltaTime)
 {
 	INPUTMAN->Update( fDeltaTime );
 
+	/* Make sure that nothing gets inserted while we do this, to prevent
+	 * things like "key pressed, key release, key repeat". */
+	LockMut(queuemutex);
+
 	for( int d=0; d<NUM_INPUT_DEVICES; d++ )	// foreach InputDevice
 	{
 		for( int b=0; b < NUM_DEVICE_BUTTONS; b++ )	// foreach button
@@ -77,8 +83,11 @@ void InputFilter::Update(float fDeltaTime)
 					iet = IET_SLOW_REPEAT;
 				}
 				if( int(fOldHoldTime/fTimeBetweenRepeats) != int(fNewHoldTime/fTimeBetweenRepeats) )
-					queue.push_back( InputEvent(InputDevice(d),b,iet) );
-
+				{
+					RageTimer now;
+					DeviceInput di(InputDevice(d),b,now);
+					queue.push_back( InputEvent(di,iet) );
+				}
 			}
 		}
 	}
@@ -97,6 +106,7 @@ float InputFilter::GetSecsHeld( DeviceInput di )
 
 void InputFilter::GetInputEvents( InputEventArray &array )
 {
+	LockMut(queuemutex);
 	array = queue;
 	queue.clear();
 }
diff --git a/stepmania/src/InputFilter.h b/stepmania/src/InputFilter.h
index 3d8ac1f9df..bee2e566dd 100644
--- a/stepmania/src/InputFilter.h
+++ b/stepmania/src/InputFilter.h
@@ -14,6 +14,7 @@
 */
 
 #include "RageInputDevice.h"
+#include "RageThreads.h"
 
 const float TIME_BEFORE_SLOW_REPEATS = 0.25f;
 const float TIME_BEFORE_FAST_REPEATS = 1.5f;
@@ -41,6 +42,7 @@ class InputFilter
 	float m_fSecsHeld[NUM_INPUT_DEVICES][NUM_DEVICE_BUTTONS];
 
 	InputEventArray queue;
+	RageMutex queuemutex;
 
 public:
 	void ButtonPressed( DeviceInput di, bool Down );