diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java
index e68566789..69f7ea66b 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java
@@ -271,6 +271,8 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La
 						Point currentSelection = sourceViewer.getSelectedRange();
 						sourceViewer.setSelectedRange(0, 0);
 						sourceViewer.setSelectedRange(currentSelection.x, currentSelection.y);
+
+						textWidget.forceFocus();
 					}
 				});
 			}