diff --git a/aegisub/video_box.cpp b/aegisub/video_box.cpp
index 8e591334b..a7e9beac5 100644
--- a/aegisub/video_box.cpp
+++ b/aegisub/video_box.cpp
@@ -144,9 +144,10 @@ VideoBox::VideoBox(wxWindow *parent)
 	videoBottomSizer->Add(VideoPosition,1,wxLEFT|wxALIGN_CENTER,5);
 	videoBottomSizer->Add(VideoSubsPos,1,wxALIGN_CENTER,0);
 	VideoSizer = new wxBoxSizer(wxVERTICAL);
-	VideoSizer->Add(topSizer,1,wxEXPAND,0);
+	VideoSizer->Add(topSizer,0,wxEXPAND,0);
 	VideoSizer->Add(videoSliderSizer,0,wxEXPAND,0);
 	VideoSizer->Add(videoBottomSizer,0,wxEXPAND,0);
+	VideoSizer->AddStretchSpacer(1);
 	SetSizer(VideoSizer);
 }
 
diff --git a/aegisub/video_display.cpp b/aegisub/video_display.cpp
index 90e274e66..d626a307a 100644
--- a/aegisub/video_display.cpp
+++ b/aegisub/video_display.cpp
@@ -408,6 +408,8 @@ void VideoDisplay::UpdateSize() {
 	// Layout
 	box->GetParent()->Layout();
 	SetClientSize(w,h);
+	GetSize(&_w,&_h);
+	SetMaxSize(wxSize(_w,_h));
 
 	// Refresh
 	locked = false;