diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java b/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
index eee3f3e4daf..816e43bf580 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
@@ -12,6 +12,7 @@
 import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.preferences.PreferencesService;
 
@@ -37,6 +38,8 @@ public class EntryEditorTabViewModel implements PreferenceTabViewModel {
     private final EntryEditorPreferences initialEntryEditorPreferences;
     private final AutoCompletePreferences initialAutoCompletePreferences;
 
+    private List<String> restartWarnings = new ArrayList<>();
+
     public EntryEditorTabViewModel(DialogService dialogService, PreferencesService preferencesService) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
@@ -107,6 +110,13 @@ public void storeSettings() {
             firstNameMode = AutoCompleteFirstNameMode.ONLY_FULL;
         }
 
+        if (initialAutoCompletePreferences.shouldAutoComplete() != enableAutoCompleteProperty.getValue()) {
+            if (enableAutoCompleteProperty.getValue()) {
+                restartWarnings.add(Localization.lang("Auto complete enable."));
+            } else {
+                restartWarnings.add(Localization.lang("Auto complete disable."));
+            }
+        }
         preferencesService.storeAutoCompletePreferences(new AutoCompletePreferences(
                 enableAutoCompleteProperty.getValue(),
                 firstNameMode,
@@ -122,7 +132,7 @@ public boolean validateSettings() {
 
     @Override
     public List<String> getRestartWarnings() {
-        return new ArrayList<>();
+        return restartWarnings;
     }
 
     public BooleanProperty openOnNewEntryProperty() {