diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLCompletionProcessor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLCompletionProcessor.java
index b9851369a9e8a2b450fa7e0b49b8f14e1fb7bb9b..28b918d2806f934da64f6b2a63927e9645aad62f 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLCompletionProcessor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLCompletionProcessor.java
@@ -364,17 +364,23 @@ public class SQLCompletionProcessor implements IContentAssistProcessor
             // Get matched children
             makeProposalsFromChildren(monitor, childObject, lastToken, proposals);
             if (proposals.isEmpty() || tokens.size() == 1) {
-                // At last - try to find child tables by pattern
-                DBSStructureAssistant structureAssistant = null;
-                for (DBSObject object = childObject; object != null; object =  object.getParentObject()) {
-                    structureAssistant = DBUtils.getAdapter(DBSStructureAssistant.class, object);
+                if (selectedContainer != null && selectedContainer != childObject) {
+                    // Try in active object
+                    makeProposalsFromChildren(monitor, selectedContainer, lastToken, proposals);
+                }
+                if (proposals.isEmpty()) {
+                    // At last - try to find child tables by pattern
+                    DBSStructureAssistant structureAssistant = null;
+                    for (DBSObject object = childObject; object != null; object =  object.getParentObject()) {
+                        structureAssistant = DBUtils.getAdapter(DBSStructureAssistant.class, object);
+                        if (structureAssistant != null) {
+                            break;
+                        }
+                    }
                     if (structureAssistant != null) {
-                        break;
+                        makeProposalsFromAssistant(monitor, structureAssistant, sc, lastToken, proposals);
                     }
                 }
-                if (structureAssistant != null) {
-                    makeProposalsFromAssistant(monitor, structureAssistant, sc, lastToken, proposals);
-                }
             }
         }
     }