diff --git a/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
index 0f1585f3c..fef1dcbf7 100644
--- a/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
+++ b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
@@ -149,7 +149,8 @@ bool CardCompleterStyler::handlePopupKeyPress(QKeyEvent *event)
     const int newRow = qBound(0, currentRow + step, rowCount - 1);
 
     if (newRow != currentRow) {
-        popup->setCurrentIndex(completer->completionModel()->index(newRow, completer->completionColumn()));
+        const QModelIndex newIndex = completer->completionModel()->index(newRow, completer->completionColumn());
+        popup->selectionModel()->setCurrentIndex(newIndex, QItemSelectionModel::NoUpdate);
     }
 
     return true;
@@ -178,7 +179,8 @@ void CardCompleterStyler::ensureClosestSelected()
     const int closestRow = rowCount - 1;
 
     if (currentRow != closestRow) {
-        popup->setCurrentIndex(completionModel->index(closestRow, completer->completionColumn()));
+        popup->selectionModel()->setCurrentIndex(completionModel->index(closestRow, completer->completionColumn()),
+                                                 QItemSelectionModel::NoUpdate);
     }
 }