diff --git a/src/SlatedGameToolkit.Framework/StateSystem/StateManager.cs b/src/SlatedGameToolkit.Framework/StateSystem/StateManager.cs
index 4fe4f65..41da94c 100644
--- a/src/SlatedGameToolkit.Framework/StateSystem/StateManager.cs
+++ b/src/SlatedGameToolkit.Framework/StateSystem/StateManager.cs
@@ -35,8 +35,9 @@ namespace SlatedGameToolkit.Framework.StateSystem
             if (initialState == null) throw new ArgumentNullException("initialState");
             Logger.Log("Initialized state manager with state: " + initialState.getName());
             thread = Thread.CurrentThread;
-            currentState = initialState;
             AddState(initialState);
+            currentState = initialState;
+            currentState.Activate();
         }
 
         internal void Update(double timeStep) {