diff --git a/lib/widget/gauge.c b/lib/widget/gauge.c
index 3ab234cf0..61c3a03ef 100644
--- a/lib/widget/gauge.c
+++ b/lib/widget/gauge.c
@@ -138,7 +138,6 @@ gauge_new (int y, int x, int cols, gboolean shown, int max, int current)
     g = g_new (WGauge, 1);
     w = WIDGET (g);
     widget_init (w, y, x, 1, cols, gauge_callback, NULL);
-    widget_want_hotkey (w, FALSE);
 
     g->shown = shown;
     if (max == 0)
diff --git a/lib/widget/groupbox.c b/lib/widget/groupbox.c
index ce266e6e5..5b404a2e0 100644
--- a/lib/widget/groupbox.c
+++ b/lib/widget/groupbox.c
@@ -106,7 +106,6 @@ groupbox_new (int y, int x, int height, int width, const char *title)
     g = g_new (WGroupbox, 1);
     w = WIDGET (g);
     widget_init (w, y, x, height, width, groupbox_callback, NULL);
-    widget_want_hotkey (w, FALSE);
 
     g->title = NULL;
     groupbox_set_title (g, title);
diff --git a/lib/widget/hline.c b/lib/widget/hline.c
index be442c5ce..3f0cddebb 100644
--- a/lib/widget/hline.c
+++ b/lib/widget/hline.c
@@ -136,7 +136,6 @@ hline_new (int y, int x, int width)
     l->text = NULL;
     l->auto_adjust_cols = (width < 0);
     l->transparent = FALSE;
-    widget_want_hotkey (w, FALSE);
 
     return l;
 }
diff --git a/lib/widget/label.c b/lib/widget/label.c
index a5cc7394a..02d6605bf 100644
--- a/lib/widget/label.c
+++ b/lib/widget/label.c
@@ -147,7 +147,6 @@ label_new (int y, int x, const char *text)
     l->text = g_strdup (text);
     l->auto_adjust_cols = TRUE;
     l->transparent = FALSE;
-    widget_want_hotkey (w, FALSE);
 
     return l;
 }
diff --git a/lib/widget/menu.c b/lib/widget/menu.c
index 663e21903..33fe88c99 100644
--- a/lib/widget/menu.c
+++ b/lib/widget/menu.c
@@ -307,7 +307,7 @@ menubar_finish (WMenuBar * menubar)
     menubar->is_dropped = FALSE;
     menubar->is_active = FALSE;
     w->lines = 1;
-    widget_want_hotkey (w, 0);
+    widget_want_hotkey (w, FALSE);
 
     /* Move the menubar to the bottom so that widgets displayed on top of
      * an "invisible" menubar get the first chance to respond to mouse events. */
@@ -588,7 +588,7 @@ menubar_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
         w->lines = LINES;
 
         /* Trick to get all of the hotkeys */
-        widget_want_hotkey (w, 1);
+        widget_want_hotkey (w, TRUE);
         menubar_draw (menubar);
         return MSG_HANDLED;