diff --git a/src/widget_type.h b/src/widget_type.h
--- a/src/widget_type.h
+++ b/src/widget_type.h
@@ -95,10 +95,9 @@ enum WidgetType {
 	WWT_EDITBOX,    ///< a textbox for typing
 	WWT_LAST,       ///< Last Item. use WIDGETS_END to fill up padding!!
 
-	WWT_MASK = 0x1F,
+	WWT_MASK = 0x7F,
 
-	WWB_PUSHBUTTON  = 1 << 5,
-	WWB_MASK        = 0xE0,
+	WWB_PUSHBUTTON  = 1 << 7,
 
 	WWT_PUSHBTN     = WWT_PANEL   | WWB_PUSHBUTTON,
 	WWT_PUSHTXTBTN  = WWT_TEXTBTN | WWB_PUSHBUTTON,
diff --git a/src/window.cpp b/src/window.cpp
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -284,7 +284,7 @@ static void DispatchLeftClickEvent(Windo
 			}
 		}
 
-		if (wi->type & WWB_MASK) {
+		if (wi->type & WWB_PUSHBUTTON) {
 			/* special widget handling for buttons*/
 			switch (wi->type) {
 				default: NOT_REACHED();