diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index 543e9862..9a0f1e2b 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -7282,6 +7282,7 @@ void Game::quittomenu(void)
         else
         {
             //Returning from editor
+            editor_disabled = !BUTTONGLYPHS_keyboard_is_available();
             returntomenu(Menu::playerworlds);
         }
     }
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index 800ceb9e..2df8963b 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -1,6 +1,7 @@
 #include <tinyxml2.h>
 #include <vector>
 
+#include "ButtonGlyphs.h"
 #include "Credits.h"
 #include "CustomLevels.h"
 #include "Editor.h"
@@ -426,6 +427,7 @@ static void menuactionpress(void)
         case 1:
             //Bring you to the normal playmenu
             music.playef(Sound_VIRIDIAN);
+            game.editor_disabled = !BUTTONGLYPHS_keyboard_is_available();
             game.createmenu(Menu::playerworlds);
             map.nexttowercolour();
             break;
@@ -614,6 +616,7 @@ static void menuactionpress(void)
     }
     case Menu::showlevelspath:
         music.playef(Sound_VIRIDIAN);
+        game.editor_disabled = !BUTTONGLYPHS_keyboard_is_available();
         game.returntomenu(Menu::playerworlds);
         map.nexttowercolour();
         break;
diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp
index fa58c732..da782e22 100644
--- a/desktop_version/src/main.cpp
+++ b/desktop_version/src/main.cpp
@@ -368,7 +368,6 @@ int main(int argc, char *argv[])
     char* langDir = NULL;
     char* fontsDir = NULL;
     bool seed_use_sdl_getticks = false;
-    bool editor_disabled = !BUTTONGLYPHS_keyboard_is_available();
 #ifdef _WIN32
     bool open_console = false;
 #endif
@@ -532,10 +531,6 @@ int main(int argc, char *argv[])
         {
             seed_use_sdl_getticks = true;
         }
-        else if (ARG("-enable-editor"))
-        {
-            editor_disabled = false;
-        }
 #undef ARG_INNER
 #undef ARG
         else
@@ -609,7 +604,6 @@ int main(int argc, char *argv[])
 
     game.init();
     game.seed_use_sdl_getticks = seed_use_sdl_getticks;
-    game.editor_disabled = editor_disabled;
 
     game.gamestate = PRELOADER;