1 files changed, 5 insertions, 1 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index 1619635dbf..179e542ccc 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -4093,8 +4093,12 @@ QItemSelectionModel::SelectionFlags QAbstractItemView::selectionCommand(const QM
                     if (d->pressedAlreadySelected)
                         return QItemSelectionModel::NoUpdate;
                     break;
-                case QEvent::KeyPress:
                 case QEvent::MouseButtonRelease:
+                    // clicking into area with no items does nothing
+                    if (!index.isValid())
+                        return QItemSelectionModel::NoUpdate;
+                    Q_FALLTHROUGH();
+                case QEvent::KeyPress:
                     // ctrl-release on selected item deselects
                     if ((keyModifiers & Qt::ControlModifier) && d->selectionModel->isSelected(index))
                         return QItemSelectionModel::Deselect | d->selectionBehaviorFlags();