diff --git a/core/block_svg.js b/core/block_svg.js
index 0faa7c2cb..efcacab5c 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -854,11 +854,6 @@ Blockly.BlockSvg.prototype.onMouseMove_ = function(e) {
     // Check to see if any of this block's connections are within range of
     // another block's connection.
     var myConnections = this.getConnections_(false);
-    // Also check the last connection on this stack
-    var lastOnStack = this.lastConnectionInStack_();
-    if (lastOnStack && lastOnStack != this.nextConnection) {
-      myConnections.push(lastOnStack);
-    }
     var closestConnection = null;
     var localConnection = null;
     var radiusConnection = Blockly.SNAP_RADIUS;
@@ -925,8 +920,9 @@ Blockly.BlockSvg.prototype.setMovable = function(movable) {
 Blockly.BlockSvg.prototype.setEditable = function(editable) {
   Blockly.BlockSvg.superClass_.setEditable.call(this, editable);
   if (this.rendered) {
-    for (var i = 0; i < this.icons_.length; i++) {
-      this.icons_[i].updateEditable();
+    var icons = this.getIcons();
+    for (var i = 0; i < icons.length; i++) {
+      icons[i].updateEditable();
     }
   }
 };
diff --git a/msg/json/pt.json b/msg/json/pt.json
index 5b7a7b89a..58b5d43ad 100644
--- a/msg/json/pt.json
+++ b/msg/json/pt.json
@@ -28,6 +28,7 @@
 	"DISABLE_BLOCK": "Desabilitar Bloco",
 	"ENABLE_BLOCK": "Habilitar Bloco",
 	"HELP": "Ajuda",
+	"UNDO": "Desfazer",
 	"CHAT": "Converse com o seu colaborador, ao digitar nesta caixa!",
 	"AUTH": "Por favor autorize esta aplicação para permitir que o seu trabalho seja gravado e que o possa partilhar.",
 	"ME": "Eu",