diff --git a/notebook/static/notebook/js/notebook.js b/notebook/static/notebook/js/notebook.js
index e01bc776c..ac0859b62 100644
--- a/notebook/static/notebook/js/notebook.js
+++ b/notebook/static/notebook/js/notebook.js
@@ -2058,15 +2058,16 @@ define(function (require) {
      */
     Notebook.prototype.execute_cell_and_insert_below = function () {
         var indices = this.get_selected_cells_indices();
+        var cell_index;
         if (indices.length > 1) {
             this.execute_cells(indices);
-            return;
+            cell_index = Math.max.apply(Math, indices);
+        } else {
+            var cell = this.get_selected_cell();
+            cell_index = this.find_cell_index(cell);
+            cell.execute();
         }
 
-        var cell = this.get_selected_cell();
-        var cell_index = this.find_cell_index(cell);
-        cell.execute();
-
         // If we are at the end always insert a new cell and return
         if (cell_index === (this.ncells()-1)) {
             this.command_mode();
diff --git a/notebook/tests/notebook/execute_selected_cells.js b/notebook/tests/notebook/execute_selected_cells.js
index 67119f397..927794e5f 100644
--- a/notebook/tests/notebook/execute_selected_cells.js
+++ b/notebook/tests/notebook/execute_selected_cells.js
@@ -13,8 +13,8 @@ casper.notebook_test(function () {
 
             } else {
                 msg = msg_prefix + 'cell ' + i + ' executed';
-                var out = that.get_output_cell(i, undefined, msg_prefix).text
-                that.test.assertEquals(out, expected[i], msg + 'out is: '+out);
+                var out = (that.get_output_cell(i, undefined, msg_prefix)||{test:'<no cells>'}).text
+                that.test.assertEquals(out, expected[i], msg + ', out is: '+out);
             }
         }
     };
@@ -139,4 +139,20 @@ casper.notebook_test(function () {
         assert_outputs(['a\n', 'b\n', undefined, 'c\n', 'd\n'],'run all cells');
         this.validate_notebook_state('run all cells', 'command', 4);
     });
+
+    this.then(function(){
+        this.set_cell_text(0, 'print("x")');
+        this.set_cell_text(1, 'print("y")');
+
+        this.select_cell(0);
+        this.select_cell(1, false);
+        this.trigger_keydown('alt-enter');
+
+    })
+    this.wait_for_output(0);
+    this.wait_for_output(1);
+    this.then(function () {
+        assert_outputs(['x\n', 'y\n', undefined, undefined,  'c\n', 'd\n'],'run selection and insert below');
+        this.validate_notebook_state('run selection insert below', 'edit', 2);
+    });
 });