diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 1c37c08f8e..4c899318bc 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -469,7 +469,7 @@ struct MainWindow : Window
 
 	virtual void OnMouseOver(Point pt, int widget)
 	{
-		if (pt.x != -1 && _game_mode != GM_MENU) {
+		if (pt.x != -1 && _game_mode != GM_MENU && _mouse_hovering) {
 			/* Show tooltip with last month production or town name */
 			const Point p = GetTileBelowCursor();
 			const TileIndex tile = TileVirtXY(p.x, p.y);
diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp
index 3ee943cb32..4fec81117d 100644
--- a/src/viewport_gui.cpp
+++ b/src/viewport_gui.cpp
@@ -155,7 +155,7 @@ public:
 
 	virtual void OnMouseOver(Point pt, int widget)
 	{
-		if (pt.x != -1) {
+		if (pt.x != -1 && _mouse_hovering) {
 			/* Show tooltip with last month production or town name */
 			const Point p = GetTileBelowCursor();
 			const TileIndex tile = TileVirtXY(p.x, p.y);