--- /opt/cvs/dotgnu/pnetlib/Xsharp/GrabWindow.cs	Tue Jun 24 13:22:49 2003
+++ Xsharp/GrabWindow.cs	Tue Jun 24 19:11:16 2003
@@ -242,13 +242,16 @@
 						lastEntered = popup;
 					}
 				}
-				if(before != null)
+				if(before != after)
 				{
-					FakeLeave(before);
-				}
-				if(after != null)
-				{
-					FakeEnter(after);
+					if(before != null)
+					{
+						FakeLeave(before);
+					}
+					if(after != null)
+					{
+						FakeEnter(after);
+					}
 				}
 			}