diff --git a/components/sdlutil/sdlvideowrapper.cpp b/components/sdlutil/sdlvideowrapper.cpp
index c64c651bc..462afc075 100644
--- a/components/sdlutil/sdlvideowrapper.cpp
+++ b/components/sdlutil/sdlvideowrapper.cpp
@@ -89,14 +89,37 @@ namespace SDLUtil
             SDL_SetWindowSize(mWindow, width, height);
             SDL_SetWindowBordered(mWindow, windowBorder ? SDL_TRUE : SDL_FALSE);
 
-            // Some display managers will automatically maximize windows whose resolution matches its current display.
-            // This breaks the SDL window if we don't move the window to the corner of that display.
-            auto index = SDL_GetWindowDisplayIndex(mWindow);
-            SDL_Rect rect{};
-            SDL_GetDisplayBounds(index, &rect);
-            if (width == rect.w && height == rect.h)
-                SDL_SetWindowPosition(mWindow, rect.x, rect.y);
+            centerWindow();
         }
     }
 
+    void VideoWrapper::centerWindow()
+    {
+
+        SDL_Rect rect{};
+        int x = 0;
+        int y = 0;
+        int w = 0;
+        int h = 0;
+        auto index = SDL_GetWindowDisplayIndex(mWindow);
+        bool reposition = false;
+        SDL_GetDisplayBounds(index, &rect);
+        SDL_GetWindowSize(mWindow, &w, &h);
+
+        x = rect.x;
+        y = rect.y;
+
+        // Center dimensions that do not fill the screen
+        if (w < rect.w)
+        {
+            x = rect.x + rect.w / 2 - w / 2;
+        }
+        if (h < rect.h)
+        {
+            y = rect.y + rect.h / 2 - h / 2;
+        }
+
+        SDL_SetWindowPosition(mWindow, x, y);
+    }
+
 }
diff --git a/components/sdlutil/sdlvideowrapper.hpp b/components/sdlutil/sdlvideowrapper.hpp
index 77f0b8039..3866c3ec3 100644
--- a/components/sdlutil/sdlvideowrapper.hpp
+++ b/components/sdlutil/sdlvideowrapper.hpp
@@ -27,6 +27,8 @@ namespace SDLUtil
 
         void setVideoMode(int width, int height, bool fullscreen, bool windowBorder);
 
+        void centerWindow();
+
     private:
         SDL_Window* mWindow;
         osg::ref_ptr<osgViewer::Viewer> mViewer;