diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index b491d091bb..493c5dc371 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,10 @@ ________________________________________________________________________________
 StepMania 5.0 $next | 20111xxx
 --------------------------------------------------------------------------------
 
+2011/12/12
+----------
+* [ScreenEdit] Add the GAMESTATE:InStepEditor LUA binding. [Wolfman2000]
+
 2011/12/11
 ----------
 * [ScreenEdit] Restore cycling the timing segments for jumping between.
diff --git a/Docs/Luadoc/Lua.xml b/Docs/Luadoc/Lua.xml
index af8873e58f..2bd63dce12 100644
--- a/Docs/Luadoc/Lua.xml
+++ b/Docs/Luadoc/Lua.xml
@@ -774,6 +774,7 @@
 			<Function name='GetStageSeed'/>
 			<Function name='GetWorkoutGoalComplete'/>
 			<Function name='HasEarnedExtraStage'/>
+			<Function name='InStepEditor'/>
 			<Function name='IsAnExtraStage'/>
 			<Function name='IsAnyHumanPlayerUsingMemoryCard'/>
 			<Function name='IsBattleMode'/>
diff --git a/Docs/Luadoc/LuaDocumentation.xml b/Docs/Luadoc/LuaDocumentation.xml
index 01ed459050..a1d032d7e3 100644
--- a/Docs/Luadoc/LuaDocumentation.xml
+++ b/Docs/Luadoc/LuaDocumentation.xml
@@ -2084,6 +2084,11 @@
 	<Function name='HasEarnedExtraStage' return='bool' arguments=''>
 		Returns <code>true</code> if an extra stage was earned.
 	</Function>
+	<Function name='InStepEditor' return='bool' arguments=''>
+		Returns <code>true</code> if we are specifically in the Step Editor's
+		editing portion. If in recording or playing mode, this will return
+		<code>false</code>.
+	</Function>
 	<Function name='IsAnExtraStage' return='bool' arguments=''>
 		Returns <code>true</code> if this is an extra stage.
 	</Function>
diff --git a/src/GameState.cpp b/src/GameState.cpp
index 05aa1c30e0..3b27cd9f11 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -2156,6 +2156,7 @@ public:
 		p->m_bMultiplayer = BArg(1);
 		return 0;
 	}
+	DEFINE_METHOD( InStepEditor,			m_bInStepEditor );
 	DEFINE_METHOD( GetNumMultiplayerNoteFields,	m_iNumMultiplayerNoteFields )
 	DEFINE_METHOD( ShowW1,				ShowW1() )
 
@@ -2476,6 +2477,7 @@ public:
 		ADD_METHOD( GetMasterPlayerNumber );
 		ADD_METHOD( GetMultiplayer );
 		ADD_METHOD( SetMultiplayer );
+		ADD_METHOD( InStepEditor );
 		ADD_METHOD( GetNumMultiplayerNoteFields );
 		ADD_METHOD( SetNumMultiplayerNoteFields );
 		ADD_METHOD( ShowW1 );