diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
index 1a7eb0a2cb4..f74ca822156 100644
--- a/src/main/java/org/jabref/JabRefGUI.java
+++ b/src/main/java/org/jabref/JabRefGUI.java
@@ -99,6 +99,8 @@ private void openWindow(Stage mainStage) {
                 KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
                 TextField focusedTextField = (TextField) scene.focusOwnerProperty().get();
                 Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
+                boolean CAFlag = Globals.prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CA);
+                boolean CFFlag = Globals.prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CF);
                 if (keyBinding.isPresent()) {
                     if (keyBinding.get().equals(KeyBinding.EMACS_DELETE)) {
                         focusedTextField.deletePreviousChar();
@@ -108,11 +110,11 @@ else if (keyBinding.get().equals(KeyBinding.EMACS_BACKWARD)) {
                         focusedTextField.backward();
                         event.consume();
                     }
-                    else if (keyBinding.get().equals(KeyBinding.EMACS_FORWARD)) {
+                    else if (CFFlag && keyBinding.get().equals(KeyBinding.EMACS_FORWARD)) {
                         focusedTextField.forward();
                         event.consume();
                     }
-                    else if (keyBinding.get().equals(KeyBinding.EMACS_BEGINNING)) {
+                    else if (CAFlag && keyBinding.get().equals(KeyBinding.EMACS_BEGINNING)) {
                         focusedTextField.home();
                         event.consume();
                     }