diff --git a/src/index.html b/src/index.html
index d8e78a6..6e208eb 100644
--- a/src/index.html
+++ b/src/index.html
@@ -392,7 +392,7 @@
     <h4>Text</h4>
     <div class="draginputs">
       <label class="draginput twocol textcontent hidden" data-title="Change Content">
-        <input id="text" type="text"/>
+        <input id="text" type="text" autocomplete="off"/>
         <span>Content</span>
       </label>
       <label>
diff --git a/src/js/select.js b/src/js/select.js
index a628d9c..cf30b31 100644
--- a/src/js/select.js
+++ b/src/js/select.js
@@ -112,7 +112,7 @@ svgedit.select.Selector.prototype.updateGripCursors = function(angle) {
   }
   var i = 0;
   for (var dir in selectorManager_.selectorGrips) {
-    selectorManager_.selectorGrips[dir].setAttribute('style', ('cursor:' + dir_arr[i] + '-resize'));
+    selectorManager_.selectorGrips[dir].style.cursor = dir_arr[i] + '-resize';
     i++;
   };
 };
@@ -128,6 +128,11 @@ svgedit.select.Selector.prototype.showGrips = function(show) {
   var elem = this.selectedElement;
   this.hasGrips = show;
   if(elem && show) {
+    const isText = elem.tagName === "text";
+    const grips = selectorManager_.selectorGrips;
+    ["n", "s", "e", "w"].forEach(dir => {
+      grips[dir].style.display = isText ? "none" : "inline";
+    });
     this.selectorGroup.appendChild(selectorManager_.selectorGripsGroup);
     this.updateGripCursors(svgedit.utilities.getRotationAngle(elem));
   }
diff --git a/src/js/svgcanvas.js b/src/js/svgcanvas.js
index c0a2e35..ac7bc6a 100644
--- a/src/js/svgcanvas.js
+++ b/src/js/svgcanvas.js
@@ -1317,6 +1317,7 @@ var recalculateDimensions = this.recalculateDimensions = function(selected) {
       tlist.removeItem(k-2);
       tlist.appendItem(mt);
     }
+    
   }
 
   // If it still has a single [M] or [R][M], return null too (prevents BatchCommand from being returned).
@@ -2746,7 +2747,7 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
           translateOrigin.setTranslate(-(left+tx),-(top+ty));
         }
 
-        if(evt.shiftKey) {
+        if(evt.shiftKey || selected.tagName === "text") {
           if(sx == 1) sx = sy
           else sy = sx;
         }