diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
index 15dd14cda..79e1b9de0 100644
--- a/src/video/cocoa/SDL_cocoawindow.m
+++ b/src/video/cocoa/SDL_cocoawindow.m
@@ -876,7 +876,7 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
     button = [nswindow standardWindowButton:NSWindowMiniaturizeButton];
     if (button) {
         int iterations = 0;
-        while (![button isEnabled]) {
+        while (![button isEnabled] && (iterations < 100)) {
             SDL_Delay(10);
             SDL_PumpEvents();
             iterations++;