diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetFilterContentAdapter.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetFilterContentAdapter.java
index f6d36afe5b683c61345584598efaf8eaedb9d5ea..1e84c23bddb6c739f69dee746069ae7b41265d76 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetFilterContentAdapter.java
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetFilterContentAdapter.java
@@ -47,7 +47,7 @@ public class ResultSetFilterContentAdapter extends StyledTextContentAdapter {
             for (int i = selection.x - 1; i >= 0; i--) {
                 String prefix = curValue.substring(i, selection.x);
                 if (contentsUC.startsWith(prefix)) {
-                    if (i == 0 || curValue.substring(i - 1, selection.x).startsWith(" ")) {
+                    if (i == 0 || !Character.isJavaIdentifierPart(curValue.charAt(i - 1))) {
                         text.setSelection(i, selection.x);
                         break;
                     }