diff --git a/libraries/ZWidget/src/core/widget.cpp b/libraries/ZWidget/src/core/widget.cpp
index 7ddc1ca59c..2bbbf21f2e 100644
--- a/libraries/ZWidget/src/core/widget.cpp
+++ b/libraries/ZWidget/src/core/widget.cpp
@@ -563,8 +563,10 @@ void Widget::OnWindowMouseMove(const Point& pos)
 		do
 		{
 			widget->OnMouseMove(widget->MapFrom(this, pos));
+			if (widget == this)
+				break;
 			widget = widget->Parent();
-		} while (widget != this);
+		} while (widget);
 	}
 }