diff --git a/mapeditor.cpp b/mapeditor.cpp
index bf670df6..07f79fb6 100644
--- a/mapeditor.cpp
+++ b/mapeditor.cpp
@@ -1869,17 +1869,6 @@ int read_editor_args() {
   else if(argis("-pic")) { shift(); picfile = args(); }
   else if(argis("-load")) { PHASE(3); shift(); mapstream::loadMap(args()); }
   else if(argis("-picload")) { PHASE(3); shift(); mapeditor::loadPicFile(args()); }
-  else if(argis("-noplayer")) mapeditor::drawplayer = !mapeditor::drawplayer;
-  else if(argis("-canvas")) {
-    PHASEFROM(2);
-    stop_game();
-    firstland = specialland = laCanvas;
-    shift();
-    if(args() == "i") canvas_invisible = !canvas_invisible;
-    else if(args().size() == 1) patterns::whichCanvas = args()[0];
-    else patterns::canvasback = arghex();
-    stop_game_and_switch_mode(rg::nothing);
-    }
   else return 1;
   return 0;
   }
diff --git a/pattern2.cpp b/pattern2.cpp
index 147f8239..885c2193 100644
--- a/pattern2.cpp
+++ b/pattern2.cpp
@@ -2292,6 +2292,18 @@ int read_pattern_args() {
     shift(); linepatterns::patterns[id].color = arghex();
     }
 
+  else if(argis("-noplayer")) mapeditor::drawplayer = !mapeditor::drawplayer;
+  else if(argis("-canvas")) {
+    PHASEFROM(2);
+    stop_game();
+    firstland = specialland = laCanvas;
+    shift();
+    if(args() == "i") canvas_invisible = !canvas_invisible;
+    else if(args().size() == 1) patterns::whichCanvas = args()[0];
+    else patterns::canvasback = arghex();
+    stop_game_and_switch_mode(rg::nothing);
+    }
+
   else return 1;
   return 0;
   }