diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 8efd6f0dd7..3813b30dd6 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -2131,9 +2131,15 @@ SDL_Window *SDL_CreateWindowWithProperties(SDL_PropertiesID props)
         parent->first_child = window;
     }
 
-    if (_this->CreateSDLWindow && _this->CreateSDLWindow(_this, window, props) < 0) {
-        SDL_DestroyWindow(window);
-        return NULL;
+    if (_this->CreateSDLWindow) {
+        if (_this->CreateSDLWindow(_this, window, props) < 0) {
+            SDL_DestroyWindow(window);
+            return NULL;
+        }
+    } else {
+        /* No windowing system, make sure the new window has focus */
+        SDL_SetMouseFocus(window);
+        SDL_SetKeyboardFocus(window);
     }
 
     /* Clear minimized if not on windows, only windows handles it at create rather than FinishWindowCreation,