diff --git a/editor/svg-editor.css b/editor/svg-editor.css
index 213938dd..c147c8e2 100644
--- a/editor/svg-editor.css
+++ b/editor/svg-editor.css
@@ -1074,12 +1074,12 @@ span.zoom_tool {
 	display: none;
 }
 
-#svg_source_editor #svg_source_overlay {
+.overlay {
 	position: absolute;
-	top: 0px;
-	right: 0px;
-	left: 0px;
-	bottom: 0px;
+	top: 0;
+	right: 0;
+	left: 0;
+	bottom: 0;
 	background-color: black;
 	opacity: 0.6;
 	z-index: 5;
@@ -1245,18 +1245,6 @@ span.zoom_tool {
 	margin-left: 0;
 }
 
-#svg_docprops #svg_docprops_overlay,
-#svg_prefs #svg_prefs_overlay {
-	position: absolute;
-	top: 0px;
-	right: 0px;
-	left: 0px;
-	bottom: 0px;
-	background-color: black;
-	opacity: 0.6;
-	z-index: 20000;
-}
-
 #tool_prefs_option {
 	float: right;
 }
@@ -1303,17 +1291,6 @@ span.zoom_tool {
 	display: none;
 }
 
-#dialog_box_overlay {
-	background: black;
-	opacity: .5;
-	height:100%;
-	left:0;
-	position:absolute;
-	top:0;
-	width:100%;
-	z-index: 6;
-}
-
 #dialog_content {
 	height: 95px;
 	margin: 10px 10px 5px 10px;
diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index 7eae9bbc..59a082c9 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -600,7 +600,7 @@
 </div> <!-- svg_editor -->
 
 <div id="svg_source_editor">
-	<div id="svg_source_overlay"></div>
+	<div class="overlay"></div>
 	<div id="svg_source_container">
 		<div id="tool_source_back" class="toolbar_button">
 			<button id="tool_source_save">Apply Changes</button>
@@ -618,7 +618,7 @@
 
 
 <div id="svg_docprops">
-	<div id="svg_docprops_overlay"></div>
+	<div class="overlay"></div>
 	<div id="svg_docprops_container">
 		<div id="tool_docprops_back" class="toolbar_button">
 			<button id="tool_docprops_save">OK</button>
@@ -631,15 +631,15 @@
 			<label>
 				<span id="svginfo_title">Title:</span>
 				<input type="text" id="canvas_title"/>
-			</label>			
-	
+			</label>
+
 			<fieldset id="change_resolution">
 				<legend id="svginfo_dim">Canvas Dimensions</legend>
 
 				<label><span id="svginfo_width">width:</span> <input type="text" id="canvas_width" size="6"/></label>
-					
+
 				<label><span id="svginfo_height">height:</span> <input type="text" id="canvas_height" size="6"/></label>
-				
+
 				<label>
 					<select id="resolution">
 						<option id="selectedPredefined" selected="selected">Select predefined:</option>
@@ -657,14 +657,14 @@
 				<legend id="includedImages">Included Images</legend>
 				<label><input type="radio" name="image_opt" value="embed" checked="checked"/> <span id="image_opt_embed">Embed data (local files)</span> </label>
 				<label><input type="radio" name="image_opt" value="ref"/> <span id="image_opt_ref">Use file reference</span> </label>
-			</fieldset>			
+			</fieldset>
 		</fieldset>
 
 	</div>
 </div>
 
 <div id="svg_prefs">
-	<div id="svg_prefs_overlay"></div>
+	<div class="overlay"></div>
 	<div id="svg_prefs_container">
 		<div id="tool_prefs_back" class="toolbar_button">
 			<button id="tool_prefs_save">OK</button>
@@ -712,7 +712,7 @@
 				<label><span id="svginfo_bg_url">URL:</span> <input type="text" id="canvas_bg_url"/></label>
 				<p id="svginfo_bg_note">Note: Background will not be saved with image.</p>
 			</fieldset>
-			
+
 			<fieldset id="change_grid">
 				<legend id="svginfo_grid_settings">Grid</legend>
 				<label><span id="svginfo_snap_onoff">Snapping on/off</span><input type="checkbox" value="snapping_on" id="grid_snapping_on"></label>
@@ -750,14 +750,14 @@
 				</label>
  -->
 			</fieldset>
-	
+
 		</fieldset>
 
 	</div>
 </div>
 
 <div id="dialog_box">
-	<div id="dialog_box_overlay"></div>
+	<div class="overlay"></div>
 	<div id="dialog_container">
 		<div id="dialog_content"></div>
 		<div id="dialog_buttons"></div>
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index bfd7a9f2..42091dd4 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -3914,7 +3914,7 @@
 					{sel: '#tool_import', fn: clickImport, evt: 'mouseup'},
 					{sel: '#tool_source', fn: showSourceEditor, evt: 'click', key: ['U', true]},
 					{sel: '#tool_wireframe', fn: clickWireframe, evt: 'click', key: ['F', true]},
-					{sel: '#tool_source_cancel,#svg_source_overlay,#tool_docprops_cancel,#tool_prefs_cancel', fn: cancelOverlays, evt: 'click', key: ['esc', false, false], hidekey: true},
+					{sel: '#tool_source_cancel,.overlay,#tool_docprops_cancel,#tool_prefs_cancel', fn: cancelOverlays, evt: 'click', key: ['esc', false, false], hidekey: true},
 					{sel: '#tool_source_save', fn: saveSourceEditor, evt: 'click'},
 					{sel: '#tool_docprops_save', fn: saveDocProperties, evt: 'click'},
 					{sel: '#tool_docprops', fn: showDocProperties, evt: 'mouseup'},