diff --git a/Source/Engine/Platform/SDL/SDLWindow.cpp b/Source/Engine/Platform/SDL/SDLWindow.cpp
index 3608b8168..3f34f030a 100644
--- a/Source/Engine/Platform/SDL/SDLWindow.cpp
+++ b/Source/Engine/Platform/SDL/SDLWindow.cpp
@@ -320,14 +320,18 @@ SDLWindow* SDLWindow::GetWindowFromEvent(const SDL_Event& event)
 
 SDLWindow* SDLWindow::GetWindowWithSDLWindow(SDL_Window* window)
 {
+    SDLWindow* found = nullptr;
     WindowsManager::WindowsLocker.Lock();
     for (auto win : WindowsManager::Windows)
     {
         if (win->_window == window)
-            return win;
+        {
+            found = win;
+            break;
+        }
     }
     WindowsManager::WindowsLocker.Unlock();
-    return nullptr;
+    return found;
 }
 
 void SDLWindow::HandleEvent(SDL_Event& event)