diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index 35760b7872..0b8f28af26 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -1306,6 +1306,13 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
 			if( input.type != IET_FIRST_PRESS )
 				break;	// We only care about first presses
 
+			
+			if( !GAMESTATE->m_bIsEditorStepTiming )
+			{
+				// TODO: broadcast a message...?
+				break; // Only allow steps to be hit in Step Timing.
+			}
+			
 			int iCol = EditB - EDIT_BUTTON_COLUMN_0;