diff --git a/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/assist/StyledCompletionProposal.java b/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/assist/StyledCompletionProposal.java
index 642569ee..a3c54333 100644
--- a/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/assist/StyledCompletionProposal.java
+++ b/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/assist/StyledCompletionProposal.java
@@ -84,8 +84,8 @@ public Point getSelection(IDocument document) {
                 offset = replacementOffset - prefix.length();
             }
         }
-        int replacementIndex = replacementString.indexOf(selection);
-        int selectionStart = offset + (replacementIndex < 0 ? 0 : replacementIndex);
+        int replacementIndex = !"".equals(selection) ? replacementString.indexOf(selection) : -1;
+        int selectionStart = offset + (replacementIndex < 0 ? replacementString.length() : replacementIndex);
         return new Point(selectionStart, selection.length());
     }