diff --git a/doc/xschem_man/commands.html b/doc/xschem_man/commands.html
index 83be3dbc..84500785 100644
--- a/doc/xschem_man/commands.html
+++ b/doc/xschem_man/commands.html
@@ -262,8 +262,9 @@ ctrl        'z'         Zoom out
 shift       '*'         Postscript/pdf print
 ctr+shift   '*'         Xpm/png print
 alt+shift   '*'         Svg print
-ctrl        '-'         Test mode: change line width
-ctrl        '+'         Test mode: change line width
+ctrl        '-'         Decrease line width
+alt         '-'         Set line width
+ctrl        '+'         Increase line width
 -           '_'         Toggle change line width
 -           '%'         Toggle draw grid
 ctrl        '='         Toggle fill rectangles
diff --git a/src/callback.c b/src/callback.c
index fdf11ca9..13d1dce4 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -3892,6 +3892,9 @@ static void handle_key_press(int event, KeySym key, int state, int rstate, int m
         tclsetboolvar("change_lw", 0);
         draw();
       }
+      else if(EQUAL_MODMASK) { 
+        tcleval("set change_lw 0; input_line \"Enter linewidth (float):\" \"xschem line_width\"");
+      }
       break;
     
     case XK_Return: 
diff --git a/src/keys.help b/src/keys.help
index 959e2a42..f703f449 100644
--- a/src/keys.help
+++ b/src/keys.help
@@ -203,8 +203,9 @@ ctrl        'z'         Zoom out
 shift       '*'         Postscript/pdf print
 ctr+shift   '*'         Xpm/png print
 alt+shift   '*'         Svg print
-ctrl        '-'         Test mode: change line width
-ctrl        '+'         Test mode: change line width
+ctrl        '-'         Decrease line width
+alt         '-'         Set line width
+ctrl        '+'         Increase line width
 -           '_'         Toggle change line width
 -           '%'         Toggle draw grid
 ctrl        '='         Toggle fill rectangles
diff --git a/src/xschem.tcl b/src/xschem.tcl
index 764070ec..8524cbcf 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -9108,7 +9108,7 @@ proc build_widgets { {topwin {} } } {
 
   $topwin.menubar.view add checkbutton -label "Toggle variable line width" -variable change_lw \
      -selectcolor $selectcolor -accelerator {_}
-  $topwin.menubar.view add command -label "Set line width" \
+  $topwin.menubar.view add command -label "Set line width" -accelerator {Alt+-} \
        -command {
          set change_lw 0
          input_line "Enter linewidth (float):" "xschem line_width"
diff --git a/xschem_library/devices/bindkeys_cheatsheet.sym b/xschem_library/devices/bindkeys_cheatsheet.sym
index e51ffa3c..62c1761d 100644
--- a/xschem_library/devices/bindkeys_cheatsheet.sym
+++ b/xschem_library/devices/bindkeys_cheatsheet.sym
@@ -404,7 +404,7 @@ T {Toggle fill style} 962.5 -355 0 0 0.18 0.18 {layer=4}
 T {-} 962.5 -343.75 0 0 0.18 0.18 {layer=12}
 T {-} 962.5 -332.5 0 0 0.18 0.18 {}
 T {Decr line width} 882.5 -355 0 0 0.18 0.18 {layer=4}
-T {Change line w.} 882.5 -343.75 0 0 0.18 0.18 {layer=12}
+T {Variab. line w.} 882.5 -343.75 0 0 0.18 0.18 {layer=12}
 T {-} 882.5 -332.5 0 0 0.18 0.18 {}
 T {Pr.Scr} 1202.5 -477.5 0 0 0.4 0.4 {lock=0}
 T {Grab scr area} 1202.5 -412.5 0 0 0.18 0.18 {}
@@ -448,3 +448,4 @@ T {-} 842.5 -92.5 0 0 0.18 0.18 {}
 T {-} 842.5 -126.25 0 0 0.18 0.18 {layer=7}
 T {-} 842.5 -137.5 0 0 0.18 0.18 {layer=6}
 T {Incr line width} 962.5 -366.25 0 0 0.18 0.18 {layer=6}
+T {Set line width} 882.5 -366.25 0 0 0.18 0.18 {layer=7}