diff --git a/node_modules/ace/lib/ace/line_widgets.js b/node_modules/ace/lib/ace/line_widgets.js
index c8154a13..6eaffc88 100644
--- a/node_modules/ace/lib/ace/line_widgets.js
+++ b/node_modules/ace/lib/ace/line_widgets.js
@@ -294,6 +294,8 @@ function LineWidgets(session) {
             if (!w || !w.el) continue;
             if (w.session != this.session) continue;
             if (!w._inDocument) {
+                if (this.session.lineWidgets[w.row] != w)
+                    continue;
                 w._inDocument = true;
                 renderer.container.appendChild(w.el);
             }
diff --git a/node_modules/ace/lib/ace/selection.js b/node_modules/ace/lib/ace/selection.js
index ed57682f..328df4b0 100644
--- a/node_modules/ace/lib/ace/selection.js
+++ b/node_modules/ace/lib/ace/selection.js
@@ -799,8 +799,10 @@ var Selection = function(session) {
         var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenPos.column);
         
         if (rows !== 0 && chars === 0 && docPos.row === this.lead.row && docPos.column === this.lead.column) {
-            if (this.session.lineWidgets && this.session.lineWidgets[docPos.row])
-                docPos.row++;
+            if (this.session.lineWidgets && this.session.lineWidgets[docPos.row]) {
+                if (docPos.row > 0 || rows > 0)
+                    docPos.row++;
+            }
         }
 
         // move the cursor and update the desired column
diff --git a/package.json b/package.json
index 92b44af5..38238852 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
         "c9.ide.save": "#e00549cb0f",
         "c9.ide.scm": "#2398826541",
         "c9.ide.terminal.monitor": "#b76f1c9f24",
-        "c9.ide.test": "#43451098ec",
+        "c9.ide.test": "#b772e67dee",
         "c9.ide.test.mocha": "#ff5603786d",
         "c9.ide.theme.flat": "#2de8414db7",
         "c9.ide.threewaymerge": "#229382aa0b",