diff --git gui/tool_selector.cc gui/tool_selector.cc
index 0c761e73d2..9eb70e882f 100644
--- gui/tool_selector.cc
+++ gui/tool_selector.cc
@@ -55,9 +55,9 @@ void tool_selector_t::add_tool_selector(tool_t *tool_in)
 	int ww = max(2,(display_get_width()/env_t::iconsize.w)-2); // to avoid zero or negative ww on posix (no graphic) backends
 	tool_icon_width = tools.get_count();
 DBG_DEBUG4("tool_selector_t::add_tool()","ww=%i, tool_icon_width=%i",ww,tool_icon_width);
-	if(  allow_break  &&  (ww<tool_icon_width  
-		||  (env_t::toolbar_max_width>0  &&  env_t::toolbar_max_width<tool_icon_width)  
-		||  (env_t::toolbar_max_width<0  &&  (ww+env_t::toolbar_max_width)<tool_icon_width))  
+	if(  allow_break  &&  (ww<tool_icon_width
+		||  (env_t::toolbar_max_width>0  &&  env_t::toolbar_max_width<tool_icon_width)
+		||  (env_t::toolbar_max_width<0  &&  (ww+env_t::toolbar_max_width)<tool_icon_width))
 		) {
 		//break them
 		int rows = (tool_icon_width/ww)+1;
@@ -231,7 +231,8 @@ bool tool_selector_t::infowin_event(const event_t *ev)
 void tool_selector_t::draw(scr_coord pos, scr_size sz)
 {
 	player_t *player = welt->get_active_player();
-	display_push_clip_wh( pos.x, pos.y+D_TITLEBAR_HEIGHT, sz.w, sz.h, 0 );
+
+	display_push_clip_wh( pos.x, pos.y+D_TITLEBAR_HEIGHT, sz.w, sz.h );
 
 	if( toolbar_id == 0 ) {
 		// sanity checks for main menu
@@ -272,7 +273,8 @@ void tool_selector_t::draw(scr_coord pos, scr_size sz)
 			tools[i].selected = tools[i].tool->is_selected();
 		}
 	}
-	display_pop_clip_wh( 0 );
+	display_pop_clip_wh();
+
 	if( is_dragging ) {
 		mark_rect_dirty_wc(pos.x, pos.y+D_TITLEBAR_HEIGHT, pos.x+sz.w, pos.y+sz.h+D_TITLEBAR_HEIGHT );
 	}