diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in
index fa52b8ade9..9792028f0d 100644
--- a/gtk2_ardour/clearlooks.rc.in
+++ b/gtk2_ardour/clearlooks.rc.in
@@ -412,6 +412,10 @@ style "transport_frame"
 {
 }
 
+style "editor_window"
+{
+}
+
 style "transport_base" = "medium_bold_text"
 {
 }
@@ -1094,6 +1098,8 @@ widget "*timecodeoffset clock" style:highest "medium_text"
 widget "*BaseFrame" style:highest "base_frame"
 widget "*TransportFrame" style:highest "transport_frame"
 widget "*TransportFrame*" style:highest  "transport_frame"
+widget "*EditorWindow*" style:highest  "editor_window"
+widget "*EditorWindow" style:highest  "editor_window"
 
 widget "*SendStripBase" style:highest "send_strip_base"
 widget "*AudioTrackStripBase" style:highest "audio_track_base"
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index d7e65a13cc..8978a4993a 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -757,9 +757,21 @@ Editor::Editor ()
 	global_vpacker.set_spacing (2);
 	global_vpacker.set_border_width (0);
 
-	global_vpacker.pack_start (toolbar_hbox, false, false);
-	global_vpacker.pack_start (edit_pane, true, true);
-	global_hpacker.pack_start (global_vpacker, true, true);
+	Gtk::EventBox* ebox = manage (new Gtk::EventBox);  //a themeable box
+	ebox->set_name("EditorWindow");
+	ebox->add (toolbar_hbox);
+
+	Gtk::EventBox* epane_box = manage (new Gtk::EventBox);  //a themeable box
+	epane_box->set_name("EditorWindow");
+	epane_box->add (edit_pane);
+
+	Gtk::EventBox* epane_box2 = manage (new Gtk::EventBox);  //a themeable box
+	epane_box2->set_name("EditorWindow");
+	epane_box2->add (global_vpacker);
+
+	global_vpacker.pack_start (*ebox, false, false);
+	global_vpacker.pack_start (*epane_box, true, true);
+	global_hpacker.pack_start (*epane_box2, true, true);
 
 	/* need to show the "contents" widget so that notebook will show if tab is switched to
 	 */