diff --git a/src/main/java/org/ballerinalang/plugins/idea/completion/BallerinaKeywordsCompletionContributor.java b/src/main/java/org/ballerinalang/plugins/idea/completion/BallerinaKeywordsCompletionContributor.java
index 2cdb3d56..6bdef8e4 100644
--- a/src/main/java/org/ballerinalang/plugins/idea/completion/BallerinaKeywordsCompletionContributor.java
+++ b/src/main/java/org/ballerinalang/plugins/idea/completion/BallerinaKeywordsCompletionContributor.java
@@ -26,6 +26,7 @@
 import com.intellij.psi.util.PsiTreeUtil;
 import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode;
 import org.ballerinalang.plugins.idea.BallerinaTypes;
+import org.ballerinalang.plugins.idea.psi.AnnotationAttachmentNode;
 import org.ballerinalang.plugins.idea.psi.AnnotationDefinitionNode;
 import org.ballerinalang.plugins.idea.psi.CallableUnitBodyNode;
 import org.ballerinalang.plugins.idea.psi.ConnectorBodyNode;
@@ -107,7 +108,8 @@ public void fillCompletionVariants(@NotNull CompletionParameters parameters, @No
                     addCreateKeyword(result);
                 }
 
-                if (prevVisibleSibling != null && prevVisibleSibling.getText().matches("[;{}]")) {
+                if (prevVisibleSibling != null && prevVisibleSibling.getText().matches("[;{}]")
+                        && !(prevVisibleSibling.getParent() instanceof AnnotationAttachmentNode)) {
                     // Todo - change method
                     addOtherTypeAsLookup(result);
                     addXmlnsAsLookup(result);
@@ -119,7 +121,10 @@ public void fillCompletionVariants(@NotNull CompletionParameters parameters, @No
 
                     result.addAllElements(BallerinaCompletionUtils.createCommonKeywords());
                 }
-                addValueKeywords(result);
+                if (prevVisibleSibling == null
+                        || !(prevVisibleSibling.getParent() instanceof AnnotationAttachmentNode)) {
+                    addValueKeywords(result);
+                }
             }
 
             ConnectorBodyNode connectorBodyNode = PsiTreeUtil.getParentOfType(element, ConnectorBodyNode.class);