diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 60fd778a4a..3125413d76 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2731,22 +2731,15 @@ gdk_event_translate (MSG *msg,
     }
     break;
 
-     case WM_MOUSEACTIVATE:
-       {
-	 if (GDK_IS_DRAG_SURFACE (window))
-	   {
-	     *ret_valp = MA_NOACTIVATE;
-	     return_val = TRUE;
-	   }
+    case WM_MOUSEACTIVATE:
+      if (GDK_IS_DRAG_SURFACE (window) ||
+          _gdk_modal_blocked (window))
+        {
+          *ret_valp = MA_NOACTIVATE;
+          return_val = TRUE;
+        }
 
-	 if (_gdk_modal_blocked (window))
-	   {
-	     *ret_valp = MA_NOACTIVATEANDEAT;
-	     return_val = TRUE;
-	   }
-       }
-
-       break;
+      break;
 
     case WM_POINTERACTIVATE:
       if (GDK_IS_DRAG_SURFACE (window) ||