diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 87003b1e69..fa4e459279 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -353,7 +353,7 @@ protected:
 
     // set the current cursor for all GdkWindows making part of this widget
     // (see GTKGetWindow)
-    //
+public:
     // should be called from OnInternalIdle() if it's overridden
     void GTKUpdateCursor();
 
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index abae449a8a..65b0886c75 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1729,6 +1729,8 @@ gtk_window_motion_notify_callback( GtkWidget *widget,
         if (win->GetEventHandler()->ProcessEvent( cevent ))
         {
             // Rewrite cursor handling here (away from idle).
+            win->SetCursor( cevent.GetCursor() );
+            win->GTKUpdateCursor();
         }
     }
 
@@ -1944,6 +1946,8 @@ gtk_window_enter_callback( GtkWidget *widget,
         if (win->GetEventHandler()->ProcessEvent( cevent ))
         {
             // Rewrite cursor handling here (away from idle).
+            win->SetCursor( cevent.GetCursor() );
+            win->GTKUpdateCursor();
         }
     }