diff --git a/Editors/PathEditor.cpp b/Editors/PathEditor.cpp
index d5cb8463f..7977a2f64 100644
--- a/Editors/PathEditor.cpp
+++ b/Editors/PathEditor.cpp
@@ -195,8 +195,6 @@ void PathEditor::MousePressed(Qt::MouseButton button) {
       if (pt == _ui->roomView->mousePos) {
         QModelIndex newSelectIndex = _pointsModel->index(i, Path::Point::kXFieldNumber);
         _ui->pointsTableView->setCurrentIndex(newSelectIndex);
-        _ui->pointsTableView->selectionModel()->select(newSelectIndex,
-                                                       QItemSelectionModel::QItemSelectionModel::ClearAndSelect);
         return;
       }
     }
@@ -212,12 +210,17 @@ void PathEditor::MouseReleased(Qt::MouseButton button) {
   }
 }
 
-void PathEditor::UpdateSelection(const QItemSelection& selected, const QItemSelection& /*deselected*/) {
-  int selectIndex = -1;
-  if (!selected.indexes().empty()) selectIndex = selected.indexes()[0].row();
-  _ui->roomView->selectedPointIndex = selectIndex;
+void PathEditor::UpdateSelection(const QItemSelection& /*selected*/, const QItemSelection& /*deselected*/) {
+  auto selectedPoints = _ui->pointsTableView->selectionModel()->selectedRows();
+  bool hasSelectedPoint = !selectedPoints.empty();
+  // delete button should be enabled if the cumulative selection is not empty
+  // and contains at least one selected row with every column selected
+  _ui->deletePointButton->setEnabled(hasSelectedPoint);
+  // keep most recently selected point selected in the preview
+  if (hasSelectedPoint)
+    _ui->roomView->selectedPointIndex = selectedPoints.last().row();
+  // update preview on point selection and deselection
   _ui->pathPreviewBackground->update();
-  _ui->deletePointButton->setDisabled((selectIndex == -1));
 }
 
 void PathEditor::on_addPointButton_pressed() {
@@ -232,17 +235,16 @@ void PathEditor::on_insertPointButton_pressed() {
 
 void PathEditor::on_deletePointButton_pressed() {
   int deleteIndex = _ui->pointsTableView->selectionModel()->currentIndex().row();
-  {
-    RepeatedMessageModel::RowRemovalOperation remover(_pointsModel);
-    remover.RemoveRow(deleteIndex);
-  }
+  // this operation is temporary and will self destruct immediately removing the rows
+  RepeatedMessageModel::RowRemovalOperation(_pointsModel)
+      .RemoveRows(_ui->pointsTableView->selectionModel()->selectedRows());
 
   if (_pointsModel->rowCount() > 0) {
-    QModelIndex newSelectIndex =
-        _pointsModel->index((deleteIndex == 0) ? 0 : deleteIndex - 1, Path::Point::kXFieldNumber);
+    auto rowCount = _ui->pointsTableView->model()->rowCount();
+    QModelIndex newSelectIndex = _pointsModel->index(
+          (deleteIndex >= rowCount) ? rowCount - 1 : deleteIndex,
+          Path::Point::kXFieldNumber);
     _ui->pointsTableView->setCurrentIndex(newSelectIndex);
-    _ui->pointsTableView->selectionModel()->select(newSelectIndex,
-                                                   QItemSelectionModel::QItemSelectionModel::ClearAndSelect);
   } else {
     _ui->deletePointButton->setDisabled(true);
     _ui->pointsTableView->selectionModel()->clearSelection();
diff --git a/Editors/PathEditor.ui b/Editors/PathEditor.ui
index 0ae089e00..a0052bf17 100644
--- a/Editors/PathEditor.ui
+++ b/Editors/PathEditor.ui
@@ -513,10 +513,10 @@
           <item>
            <widget class="QTableView" name="pointsTableView">
             <property name="selectionMode">
-             <enum>QAbstractItemView::SingleSelection</enum>
+             <enum>QAbstractItemView::ExtendedSelection</enum>
             </property>
             <property name="selectionBehavior">
-             <enum>QAbstractItemView::SelectItems</enum>
+             <enum>QAbstractItemView::SelectRows</enum>
             </property>
             <attribute name="horizontalHeaderStretchLastSection">
              <bool>true</bool>
diff --git a/Models/RepeatedModel.h b/Models/RepeatedModel.h
index 9ac943c91..60e57cfa0 100644
--- a/Models/RepeatedModel.h
+++ b/Models/RepeatedModel.h
@@ -144,6 +144,10 @@ class RepeatedModel : public ProtoModel {
     void RemoveRows(int row, int count) {
       for (int i = row; i < row + count; ++i) _rows.insert(i);
     }
+    void RemoveRows(const QModelIndexList& indexes) {
+      foreach (auto index, indexes)
+        RemoveRow(index.row());
+    }
 
     ~RowRemovalOperation() {
       if (_rows.empty()) return;