diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index bca315f80b3..4cb28d08043 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -2450,7 +2450,7 @@ void QHeaderView::mouseMoveEvent(QMouseEvent *e)
         case QHeaderViewPrivate::SelectSections: {
             int logical = logicalIndexAt(qMax(-d->offset, pos));
             if (logical == -1 && pos > 0)
-                logical = d->lastVisibleVisualIndex();
+                logical = logicalIndex(d->lastVisibleVisualIndex());
             if (logical == d->pressed)
                 return; // nothing to do
             else if (d->pressed != -1)
diff --git a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp
index 1e26af8f572..af11e2a098c 100644
--- a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp
+++ b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp
@@ -140,10 +140,12 @@ private:
     QTableView *setupTableView()
     {
         tableView = new QTableView;
-        m.setRowCount(500);
+        const int rowCount = 200;
+        m.setRowCount(rowCount);
         m.setColumnCount(250);
         tableView->setSelectionMode(QAbstractItemView::SingleSelection);
         tableView->setModel(&m);
+        tableView->verticalHeader()->swapSections(rowCount - 1, 5);
         return tableView;
     }