diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp b/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp
index 5ebf8e848e..fd9c67e574 100644
--- a/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp
+++ b/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp
@@ -324,6 +324,11 @@ void SheetView::resizeRow(int col, int newSize)
 
 void SheetView::editingFinished()
 {
+    if (ui->cellContent->completerActive()) {
+        ui->cellContent->hideCompleter();
+        return;
+    }
+
     if (ui->cellAlias->completerActive()) {
         ui->cellAlias->hideCompleter();
         return;