diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 54cb8db6ec9..7ead126d8f0 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -713,6 +713,12 @@ - (void) setWindowFeatures:(const struct macdrv_window_features*)wf
                 [self setStyleMask:newStyle ^ NSClosableWindowMask];
             }
             [self setStyleMask:newStyle];
+
+            // -setStyleMask: resets the firstResponder to the window.  Set it
+            // back to the content view.
+            if ([[self contentView] acceptsFirstResponder])
+                [self makeFirstResponder:[self contentView]];
+
             [self adjustFullScreenBehavior:[self collectionBehavior]];
 
             if ([[self title] length] == 0 && [title length] > 0)