diff --git a/widget/src/gtk/nsWidget.h b/widget/src/gtk/nsWidget.h
index 186aa751a472..18223722a338 100644
--- a/widget/src/gtk/nsWidget.h
+++ b/widget/src/gtk/nsWidget.h
@@ -419,9 +419,7 @@ private:
   //
   // Keep track of the last widget being "dragged"
   //
-public:
   static nsWidget *sButtonMotionTarget;
-private:
   static gint sButtonMotionRootX;
   static gint sButtonMotionRootY;
   static gint sButtonMotionWidgetX;
diff --git a/widget/src/gtk/nsWindow.cpp b/widget/src/gtk/nsWindow.cpp
index 29bf57afdf36..53931ef8ea59 100644
--- a/widget/src/gtk/nsWindow.cpp
+++ b/widget/src/gtk/nsWindow.cpp
@@ -2752,25 +2752,19 @@ nsWindow::GetMozArea()
 PRBool
 nsWindow::GrabInProgress(void)
 {
-  // there is either an active grab or a passive grab because of a
-  // button motion event
-  return nsWindow::sIsGrabbing || nsWidget::sButtonMotionTarget;
+  return nsWindow::sIsGrabbing;
 }
 
 /* static */
 nsWindow *
 nsWindow::GetGrabWindow(void)
 {
-  if (nsWidget::sButtonMotionTarget) {
-    return NS_STATIC_CAST(nsWindow *, sButtonMotionTarget);
-  }
-
   if (nsWindow::sIsGrabbing)
   {
     return sGrabWindow;
   }
-  
-  return nsnull;
+  else
+    return nsnull;
 }
 
 GdkWindow *