diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46c259353..982dcd083 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ All notable changes to this project will be documented in this file.
 - AS3 with statement decompilation
 - #1610 AS3 unnecessary adding namespaces
 - #1610 AS3 P-code editation - true/false/undefined/null has value_index same as value_kind
+- Ribbon stealing focus when pressing Alt (for example in editors)
 
 ### Changed
 - #1565, #1407, #1350 On BinaryData SWF save, parent SWF is saved
diff --git a/lib/flamingo-6.2.jar b/lib/flamingo-6.2.jar
index 3aa78b22f..15b9250f5 100644
Binary files a/lib/flamingo-6.2.jar and b/lib/flamingo-6.2.jar differ
diff --git a/libsrc/flamingo/src/org/pushingpixels/flamingo/api/ribbon/JRibbonFrame.java b/libsrc/flamingo/src/org/pushingpixels/flamingo/api/ribbon/JRibbonFrame.java
index 4dfb667e8..3769bf95c 100644
--- a/libsrc/flamingo/src/org/pushingpixels/flamingo/api/ribbon/JRibbonFrame.java
+++ b/libsrc/flamingo/src/org/pushingpixels/flamingo/api/ribbon/JRibbonFrame.java
@@ -372,8 +372,9 @@ public class JRibbonFrame extends JFrame {
 		this.ribbon = new JRibbon(this);
 		this.add(this.ribbon, BorderLayout.NORTH);
 
-		// this.keyTipManager = new KeyTipManager(this);
-		Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
+            // this.keyTipManager = new KeyTipManager(this);
+                //JPEXS: Disabled keytips as it constantly steals focus in my editors!
+		/*Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
 			private boolean prevAltModif = false;
 
 			@Override
@@ -451,7 +452,7 @@ public class JRibbonFrame extends JFrame {
 					}
 				}
 			}
-		}, AWTEvent.KEY_EVENT_MASK | AWTEvent.MOUSE_EVENT_MASK);
+		}, AWTEvent.KEY_EVENT_MASK | AWTEvent.MOUSE_EVENT_MASK);*/
 
 		final KeyTipLayer keyTipLayer = new KeyTipLayer();
 		JRootPane rootPane = this.getRootPane();