diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg
index a1019e27..87662a55 100644
--- a/config/menus_edit.cfg
+++ b/config/menus_edit.cfg
@@ -16,7 +16,7 @@ newmenu "lighting"
 menuitem "Add white lights"		[ showmenu "White light" ]
 menuitem "Add coloured lights"	[ showmenu "Coloured light" ]
 menuitem """"
-menuitemcheckbox "Enable fullbright	"fullbright" [ if (= $arg1 1) [ fullbright 1 ] [ recalc ] ]
+menuitemcheckbox "Enable fullbright: " "$fullbright" [ fullbright $arg1 ]
 
 
 newmenu "White light"
@@ -259,4 +259,4 @@ menuitem "Broken Wood"     	"newent mapmodel 51"
 menuitem "Coffee"               "newent mapmodel 53"
 menuitem "Flyer"                "newent mapmodel 54"
 menuitem "Tree Flyer"     	"newent mapmodel 26"
-menuitem "Potato box"		"newent mapmodel 56"
\ No newline at end of file
+menuitem "Potato box"		"newent mapmodel 56"
diff --git a/source/src/editing.cpp b/source/src/editing.cpp
index db5e7fd9..8241c157 100644
--- a/source/src/editing.cpp
+++ b/source/src/editing.cpp
@@ -467,6 +467,7 @@ VARF(fullbright, 0, 0, 1,
         if(noteditmode()) return;
         fullbrightlight(176);
     }
+    else calclight();
 );
 
 void edittag(int tag)
diff --git a/source/src/menus.cpp b/source/src/menus.cpp
index fd943e28..5977000c 100644
--- a/source/src/menus.cpp
+++ b/source/src/menus.cpp
@@ -417,7 +417,7 @@ struct mitemcheckbox : mitem
         DELETEA(action);
     }
 
-    virtual int width() { return text_width(text); }
+    virtual int width() { return text_width(text) + FONTH + FONTH/3; }
 
     virtual void select()
     {