diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 6cfe87ac2c..de4eafd6d9 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -170,7 +170,7 @@ RenderingManager::RenderingManager(OEngine::Render::OgreRenderer& _rend, const b
 
     mOcclusionQuery = new OcclusionQuery(&mRendering, mSkyManager->getSunNode());
 
-    mVideoPlayer = new VideoPlayer(mRendering.getScene ());
+    mVideoPlayer = new VideoPlayer(mRendering.getScene (), mRendering.getWindow());
     mVideoPlayer->setResolution (Settings::Manager::getInt ("resolution x", "Video"), Settings::Manager::getInt ("resolution y", "Video"));
 
     mSun = 0;
diff --git a/apps/openmw/mwrender/videoplayer.cpp b/apps/openmw/mwrender/videoplayer.cpp
index 08642c5a30..bc9bef5311 100644
--- a/apps/openmw/mwrender/videoplayer.cpp
+++ b/apps/openmw/mwrender/videoplayer.cpp
@@ -8,6 +8,7 @@
 
 #include <OgreRoot.h>
 #include <OgreHardwarePixelBuffer.h>
+#include <OgreRenderWindow.h>
 
 #include <boost/thread.hpp>
 
@@ -16,6 +17,7 @@
 #include "../mwbase/soundmanager.hpp"
 #include "../mwsound/sound_decoder.hpp"
 #include "../mwsound/sound.hpp"
+#include "../mwbase/inputmanager.hpp"
 
 #include "renderconst.hpp"
 
@@ -1032,13 +1034,14 @@ public:
 #endif // defined OPENMW_USE_FFMPEG
 
 
-VideoPlayer::VideoPlayer(Ogre::SceneManager* sceneMgr)
+VideoPlayer::VideoPlayer(Ogre::SceneManager* sceneMgr, Ogre::RenderWindow* window)
     : mState(NULL)
     , mSceneMgr(sceneMgr)
     , mVideoMaterial(NULL)
     , mRectangle(NULL)
     , mNode(NULL)
     , mAllowSkipping(false)
+    , mWindow(window)
 {
     mVideoMaterial = Ogre::MaterialManager::getSingleton().getByName("VideoMaterial", "General");
     if (mVideoMaterial.isNull ())
@@ -1129,6 +1132,14 @@ void VideoPlayer::playVideo(const std::string &resourceName, bool allowSkipping)
     try {
         mState = new VideoState;
         mState->init(resourceName);
+
+        while (isPlaying())
+        {
+            MWBase::Environment::get().getInputManager()->update(0, false);
+            update();
+            mWindow->update();
+        }
+
     }
     catch(std::exception& e) {
         std::cerr<< "Failed to play video: "<<e.what() <<std::endl;
diff --git a/apps/openmw/mwrender/videoplayer.hpp b/apps/openmw/mwrender/videoplayer.hpp
index 5e9d18ba41..0e548e23e4 100644
--- a/apps/openmw/mwrender/videoplayer.hpp
+++ b/apps/openmw/mwrender/videoplayer.hpp
@@ -8,6 +8,7 @@ namespace Ogre
     class SceneManager;
     class SceneNode;
     class Rectangle2D;
+    class RenderWindow;
 }
 
 namespace MWRender
@@ -17,7 +18,7 @@ namespace MWRender
     class VideoPlayer
     {
     public:
-        VideoPlayer(Ogre::SceneManager* sceneMgr);
+        VideoPlayer(Ogre::SceneManager* sceneMgr, Ogre::RenderWindow* window);
         ~VideoPlayer();
 
         void playVideo (const std::string& resourceName, bool allowSkipping);
@@ -43,6 +44,7 @@ namespace MWRender
         Ogre::Rectangle2D* mBackgroundRectangle;
         Ogre::SceneNode* mNode;
         Ogre::SceneNode* mBackgroundNode;
+        Ogre::RenderWindow* mWindow;
 
         int mWidth;
         int mHeight;