diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index d224495a..f6ea4e0e 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -1787,7 +1787,9 @@
 				$('.tool_button_current').removeClass('tool_button_current').addClass('tool_button');
 				$(button).addClass('tool_button_current').removeClass('tool_button');
 				// when a tool is selected, we should deselect any currently selected elements
-				svgCanvas.clearSelection();
+				if(button !== '#tool_select') {
+					svgCanvas.clearSelection();
+				}
 				return true;
 			};
 			
diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index 208e3ccd..86e14cb3 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -9271,7 +9271,6 @@ this.getMode = function() {
 this.setMode = function(name) {
 	pathActions.clear(true);
 	textActions.clear();
-	
 	cur_properties = (selectedElements[0] && selectedElements[0].nodeName == 'text') ? cur_text : cur_shape;
 	current_mode = name;
 };