diff --git a/glfw/cocoa_window.m b/glfw/cocoa_window.m
index 93f500cb6..45a52f139 100644
--- a/glfw/cocoa_window.m
+++ b/glfw/cocoa_window.m
@@ -2291,8 +2291,13 @@ int _glfwPlatformWindowBell(_GLFWwindow* window UNUSED)
 
 void _glfwPlatformFocusWindow(_GLFWwindow* window)
 {
-    // Make us the active application
+    if (_glfwPlatformWindowIconified(window)) {
+        // miniaturized windows return false in canBecomeKeyWindow therefore
+        // unminiaturize first
+        [window->ns.object deminiaturize:nil];
+    }
     if ([window->ns.object canBecomeKeyWindow]) {
+        // Make us the active application
         [NSApp activateIgnoringOtherApps:YES];
         [window->ns.object makeKeyAndOrderFront:nil];
     }