diff --git a/src/main.c b/src/main.c
index 8db33b2..e32d29d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,14 +27,7 @@ int main(int argc, char **argv) {
       sizeof(ASSET_MANAGER.systemPath) / sizeof(char_t)
     );
   }
-
-  // Init the defaults for all the platforms
-  // #if PSP
-  // #else
-  //   #if SDL2_KEYBOARD
-  //   inputBind(inputButtonGetByName("")
-  // #endif
-
+  
   // Begin main loop
   do {
     ret = engineUpdate();
diff --git a/src/scene/scenemanager.c b/src/scene/scenemanager.c
index 584860c..972dd03 100644
--- a/src/scene/scenemanager.c
+++ b/src/scene/scenemanager.c
@@ -18,6 +18,12 @@ errorret_t sceneManagerInit(void) {
 
   sceneManagerRegisterScene(&SCENE_TEST);
   sceneManagerRegisterScene(&SCENE_MAP);
+
+  // Initial scene
+  scene_t *initial = sceneManagerGetSceneByName("map");
+  sceneManagerSetScene(initial);
+  if(initial->init) errorChain(initial->init(&SCENE_MANAGER.sceneData));
+  initial->flags |= SCENE_FLAG_INITIALIZED;
   
   errorOk();
 }