diff --git a/uppsrc/CtrlCore/CtrlMouse.cpp b/uppsrc/CtrlCore/CtrlMouse.cpp
index 13c4f6263..ffb7016de 100644
--- a/uppsrc/CtrlCore/CtrlMouse.cpp
+++ b/uppsrc/CtrlCore/CtrlMouse.cpp
@@ -686,6 +686,7 @@ Image& Ctrl::CursorOverride()
 
 Image Ctrl::OverrideCursor(const Image& m)
 {
+	LLOG("OverrideCursor");
 	GuiLock __;
 	Image om = CursorOverride();
 	CursorOverride() = m;
@@ -702,6 +703,7 @@ void WaitCursor::Show() {
 }
 
 WaitCursor::WaitCursor(bool show) {
+	LLOG("WaitCursor");
 	flag = true;
 	if(show) Show();
 }
diff --git a/uppsrc/CtrlCore/GtkWnd.cpp b/uppsrc/CtrlCore/GtkWnd.cpp
index 93df78fad..f1fe6f8a5 100644
--- a/uppsrc/CtrlCore/GtkWnd.cpp
+++ b/uppsrc/CtrlCore/GtkWnd.cpp
@@ -72,12 +72,15 @@ Vector<Ctrl *> Ctrl::GetTopCtrls()
 
 void  Ctrl::SetMouseCursor(const Image& image)
 {
+	LLOG("SetMouseCursor");
 	GuiLock __;
 	int64 id = image.GetSerialId();
 	Ctrl *topctrl = NULL;
 	Top *top = NULL;
 	if(mouseCtrl)
 		topctrl = mouseCtrl->GetTopCtrl();
+	else
+		topctrl = GetActiveCtrl();
 	if(topctrl)
 		top = topctrl->top;
 	if(top && id != top->cursor_id) {