1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index a61f4dd..dceeaa4 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -528,14 +528,14 @@ public class Gui {
                 return combo;
         }
 
-        public void onCaretMove(int pos) {
+        public void onCaretMove(int pos, boolean fromClick) {
                 Token token = this.controller.getToken(pos);
                 boolean isToken = token != null;
 
                 cursorReference = this.controller.getReference(token);
                 Entry<?> referenceEntry = cursorReference != null ? cursorReference.entry : null;
 
-                if (referenceEntry != null && shouldNavigateOnClick) {
+                if (referenceEntry != null && shouldNavigateOnClick && fromClick) {
                         shouldNavigateOnClick = false;
                         Entry<?> navigationEntry = referenceEntry;
                         if (cursorReference.context == null) {
@@ -768,8 +768,9 @@ public class Gui {
                                 if (response == JOptionPane.YES_OPTION) {
                                         this.saveMapping();
                                         this.frame.dispose();
-                                } else if (response == JOptionPane.NO_OPTION)
+                                } else if (response == JOptionPane.NO_OPTION) {
                                         this.frame.dispose();
+                                }
 
                                 return null;
                         }, "Save and exit", "Discard changes", "Cancel");