diff --git a/editor/svg-editor.css b/editor/svg-editor.css
index c805b656..d9904492 100644
--- a/editor/svg-editor.css
+++ b/editor/svg-editor.css
@@ -274,6 +274,7 @@ body {
 	stroke-dasharray: none;
 	opacity: 1;
 	pointer-events: stroke;
+	vector-effect: non-scaling-stroke;
 }
 
 #workarea.wireframe #svgcontent text {
diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index 67acfb0c..f0fc3d5c 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -1934,6 +1934,13 @@ function BatchCommand(text) {
 			}
 		}
 		
+		if(showGrips) {
+			selectorManager.requestSelector(selectedElements[0]).showGrips(true);
+		}
+		else if (selectedElements.length > 1) {
+			selectorManager.requestSelector(selectedElements[0]).showGrips(false);
+		}
+
 		// make sure the elements are in the correct order
 		// See: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-compareDocumentPosition
 	
@@ -1943,13 +1950,9 @@ function BatchCommand(text) {
 			}
 		});
 		
-
-		if(showGrips) {
-			selectorManager.requestSelector(selectedElements[0]).showGrips(true);
-		}
-		else if (selectedElements.length > 1) {
-			selectorManager.requestSelector(selectedElements[0]).showGrips(false);
-		}
+		// Make sure null value is at the end
+		if(!selectedElements[0]) selectedElements.push(selectedElements.shift());
+		
 	};
 
 	// TODO: could use slice here to make this faster?