diff --git a/aegisub/VideoSink.cpp b/aegisub/VideoSink.cpp
index 033d1ae07..eb239db11 100644
--- a/aegisub/VideoSink.cpp
+++ b/aegisub/VideoSink.cpp
@@ -5,8 +5,6 @@
  * 
  */
 
-#include "setup.h"
-#if USE_DIRECTSHOW == 1
 #include <windows.h>
 #ifdef __WXDEBUG__
 #undef __WXDEBUG__
@@ -564,6 +562,3 @@ HRESULT CreateVideoSink(IBaseFilter **pVS) {
 	*pVS = vs;
 	return hr;
 }
-
-
-#endif
diff --git a/aegisub/video_display.cpp b/aegisub/video_display.cpp
index a0731268b..f1761157f 100644
--- a/aegisub/video_display.cpp
+++ b/aegisub/video_display.cpp
@@ -199,6 +199,9 @@ void VideoDisplay::Render() {
 ///////////////
 // Update size
 void VideoDisplay::UpdateSize() {
+	// Loaded?
+	if (VideoContext::Get()->IsLoaded()) return;
+
 	// Get size
 	if (arType == 0) w = VideoContext::Get()->GetWidth() * zoomValue;
 	else w = VideoContext::Get()->GetHeight() * zoomValue * arValue;