diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 772d90050..d5469b321 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -348,24 +348,28 @@ public:
 		Bind (wxEVT_CLOSE_WINDOW, boost::bind (&DOMFrame::close, this, _1));
 		Bind (wxEVT_SHOW, boost::bind (&DOMFrame::show, this, _1));
 
-		/* Use a panel as the only child of the Frame so that we avoid
-		   the dark-grey background on Windows.
-		*/
-		auto overall_panel = new wxPanel (this, wxID_ANY);
+		auto splitter = new wxSplitterWindow(this, wxID_ANY);
+		auto right_panel = new wxPanel(splitter, wxID_ANY);
+
+		auto piss = new wxPanel(splitter, wxID_ANY);
 
-		_film_viewer.reset (new FilmViewer (overall_panel));
-		_controls = new StandardControls (overall_panel, _film_viewer, true);
-		_film_editor = new FilmEditor (overall_panel, _film_viewer);
-		auto job_manager_view = new JobManagerView (overall_panel, false);
+		_film_viewer.reset (new FilmViewer (right_panel));
+		_controls = new StandardControls (right_panel, _film_viewer, true);
+		_film_editor = new FilmEditor (piss, _film_viewer);
+		auto job_manager_view = new JobManagerView (right_panel, false);
 
 		auto right_sizer = new wxBoxSizer (wxVERTICAL);
 		right_sizer->Add (_film_viewer->panel(), 2, wxEXPAND | wxALL, 6);
 		right_sizer->Add (_controls, 0, wxEXPAND | wxALL, 6);
 		right_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6);
 
-		wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
-		main_sizer->Add (_film_editor, 0, wxEXPAND | wxALL, 6);
-		main_sizer->Add (right_sizer, 1, wxEXPAND | wxALL, 6);
+		right_panel->SetSizer(right_sizer);
+
+		auto shit = new wxBoxSizer(wxHORIZONTAL);
+		shit->Add(_film_editor, 1, wxEXPAND);
+		piss->SetSizer(shit);
+
+		splitter->SplitVertically(piss, right_panel);
 
 		set_menu_sensitivity ();
 
@@ -374,8 +378,6 @@ public:
 
 		JobManager::instance()->ActiveJobsChanged.connect(boost::bind(&DOMFrame::active_jobs_changed, this));
 
-		overall_panel->SetSizer (main_sizer);
-
 		UpdateChecker::instance()->StateChanged.connect(boost::bind(&DOMFrame::update_checker_state_changed, this));
 
 		FocusManager::instance()->SetFocus.connect (boost::bind (&DOMFrame::remove_accelerators, this));
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 6e0864417..41518d027 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -134,7 +134,7 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
 	{
 		auto s = new wxBoxSizer (wxHORIZONTAL);
 
-		_content = new wxListCtrl (_top_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER);
+		_content = new wxListCtrl (_top_panel, wxID_ANY, wxDefaultPosition, wxSize(-1, 160), wxLC_REPORT | wxLC_NO_HEADER);
 		_content->DragAcceptFiles (true);
 		s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
 
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 2ec174260..365d3bffe 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -55,7 +55,7 @@ FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
 	auto s = new wxBoxSizer (wxVERTICAL);
 
 	_main_notebook = new wxNotebook (this, wxID_ANY);
-	s->Add (_main_notebook, 1);
+	s->Add (_main_notebook, 1, wxEXPAND);
 
 	_content_panel = new ContentPanel (_main_notebook, _film, viewer);
 	_main_notebook->AddPage (_content_panel->window(), _("Content"), true);