diff --git a/src/widget.cpp b/src/widget.cpp
index afe5d0ad13..15da194eb2 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -131,7 +131,6 @@ static void ScrollbarClickPositioning(Window *w, NWidgetScrollbar *sb, int x, in
 			if (_scrollbar_size > button_size * 2)
 				_scrollbar_size -= button_size;
 			w->mouse_capture_widget = sb->index;
-			w->scrolling_scrollbar = sb->index;
 			_cursorpos_drag_start = _cursor.pos;
 		}
 	}
diff --git a/src/window.cpp b/src/window.cpp
index 4b72264c0d..2b3d8f837d 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2469,9 +2469,9 @@ static EventState HandleWindowDragging()
 
 			w->SetDirty();
 			if (GetWindowDraggedOffScreen(w)) {
-				GuiShowTooltips(w, STR_TOOLTIP_CLOSE_WINDOW, 0, NULL, TCC_LEFT_CLICK);
+				GuiShowTooltips(w, STR_TOOLTIP_CLOSE_WINDOW, 0, NULL, TCC_NONE);
 			} else {
-				GuiShowTooltips(w, STR_NULL, 0, NULL, TCC_LEFT_CLICK); // Hide tooltip
+				GuiShowTooltips(w, STR_NULL, 0, NULL, TCC_NONE); // Hide tooltip
 			}
 
 			return ES_HANDLED;