diff --git a/apps/openmw/mwgui/videowidget.cpp b/apps/openmw/mwgui/videowidget.cpp
index 566c7cadb..8430c1c7b 100644
--- a/apps/openmw/mwgui/videowidget.cpp
+++ b/apps/openmw/mwgui/videowidget.cpp
@@ -42,4 +42,9 @@ bool VideoWidget::update()
     return mPlayer.isPlaying();
 }
 
+void VideoWidget::cleanup()
+{
+    mPlayer.close();
+}
+
 }
diff --git a/apps/openmw/mwgui/videowidget.hpp b/apps/openmw/mwgui/videowidget.hpp
index 16a71d367..9360c8359 100644
--- a/apps/openmw/mwgui/videowidget.hpp
+++ b/apps/openmw/mwgui/videowidget.hpp
@@ -26,6 +26,9 @@ namespace MWGui
         /// @return Is the video still playing?
         bool update();
 
+        /// Free video player resources (done automatically on destruction)
+        void cleanup();
+
     private:
         bool mAllowSkipping;
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 4de3028ed..94001d877 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1576,12 +1576,13 @@ namespace MWGui
         bool cursorWasVisible = mCursorVisible;
         setCursorVisible(false);
 
-        while (mVideoWidget->update())
+        while (mVideoWidget->update() && !MWBase::Environment::get().getStateManager()->hasQuitRequest())
         {
             MWBase::Environment::get().getInputManager()->update(0, true, false);
 
             mRendering->getWindow()->update();
         }
+        mVideoWidget->cleanup();
 
         setCursorVisible(cursorWasVisible);