diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java
index 9aba5cea763..28d1e32dfa9 100644
--- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java
+++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java
@@ -109,6 +109,9 @@ public void install(ContentAssistant contentAssistant, Table table, AdditionalIn
 
 			fDisplay.addFilter(SWT.Deactivate, this);
 			fDisplay.addFilter(SWT.MouseUp, this);
+
+			fDisplay.addFilter(SWT.MouseMove, this);
+			fDisplay.addFilter(SWT.MouseEnter, this);
 		}
 	}
 
@@ -130,6 +133,9 @@ public void uninstall() {
 
 			fDisplay.removeFilter(SWT.Deactivate, this);
 			fDisplay.removeFilter(SWT.MouseUp, this);
+
+			fDisplay.removeFilter(SWT.MouseMove, this);
+			fDisplay.removeFilter(SWT.MouseEnter, this);
 		}
 	}
 
@@ -206,6 +212,8 @@ else if (event.type == SWT.MouseVerticalWheel)
 				}
 				break;
 
+			case SWT.MouseEnter:
+			case SWT.MouseMove:
 			case SWT.MouseUp:
 				if (fAdditionalInfoController == null || fAdditionalInfoController.getInternalAccessor().isReplaceInProgress())
 					break;
@@ -224,7 +232,7 @@ else if (event.type == SWT.MouseVerticalWheel)
 							}
 
 							// XXX: workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=212392 :
-							control.getShell().getDisplay().asyncExec(() -> fAdditionalInfoController.getInternalAccessor().replaceInformationControl(true));
+							fAdditionalInfoController.getInternalAccessor().replaceInformationControl(event.type == SWT.MouseUp);
 						}
 					}
 				}
diff --git a/bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF
index a85e3b30fe8..ada22acef29 100644
--- a/bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ui.editors; singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.20.100.qualifier
 Bundle-Activator: org.eclipse.ui.internal.editors.text.EditorsPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/bundles/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.properties b/bundles/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.properties
index c0141258985..2e5a7267edc 100644
--- a/bundles/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.properties
+++ b/bundles/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.properties
@@ -12,7 +12,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-EditorsPlugin_additionalInfo_affordance=Press 'Tab' from proposal table or click for focus
+EditorsPlugin_additionalInfo_affordance=Press 'Tab' from proposal table or click/hover for focus
 EditorsPlugin_internal_error=Internal Error
 
 TextEditorPreferencePage_displayedTabWidth=Displayed &tab width: