diff --git a/src/scheduler.c b/src/scheduler.c
index c1027f65..c1db6dad 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -788,7 +788,8 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
     else if(!strcmp(argv[1],"fullscreen"))
     {
       cmd_found = 1;
-      toggle_fullscreen(argv[2]);
+      if(argc > 2) toggle_fullscreen(argv[2]);
+      else toggle_fullscreen(".drw");
       Tcl_ResetResult(interp);
     }
   }
diff --git a/src/xschem.tcl b/src/xschem.tcl
index 130f17ec..dd359645 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -5083,9 +5083,10 @@ proc build_widgets { {topwin {} } } {
      }
   $topwin.menubar.view.menu add command -label "Redraw" -command "xschem redraw" -accelerator Esc
   toolbar_create ViewRedraw "xschem redraw" "Redraw" $topwin
-  $topwin.menubar.view.menu add checkbutton -label "Fullscreen" -variable fullscreen \
-     -accelerator {Alt+Shift+F} -command "
-        xschem fullscreen $topwin
+  $topwin.menubar.view.menu add command -label "Fullscreen" \
+     -accelerator "\\" -command "
+        if {\$fullscreen == 1} {set fullscreen 2} ;# avoid hiding menu in true fullscreen
+        xschem fullscreen $topwin.drw
      "
   $topwin.menubar.view.menu add command -label "Zoom Full" -command "xschem zoom_full" -accelerator F
   $topwin.menubar.view.menu add command -label "Zoom In" -command "xschem zoom_in" -accelerator Shift+Z