diff --git a/lib/ace/autocomplete/popup.js b/lib/ace/autocomplete/popup.js
index 862a1c5e..b504357a 100644
--- a/lib/ace/autocomplete/popup.js
+++ b/lib/ace/autocomplete/popup.js
@@ -197,8 +197,12 @@ var AcePopup = function(parentNode) {
 
         if (data.meta) {
             var maxW = popup.renderer.$size.scrollerWidth / popup.renderer.layerConfig.characterWidth;
-            if (data.meta.length + data.caption.length < maxW - 2)
-                tokens.push({type: "rightAlignedText", value: data.meta});
+            var metaData = data.meta;
+            if (metaData.length + data.caption.length > maxW - 2) {
+                // trim meta to fit this popup and add ellipsis
+                metaData = metaData.substr(0, maxW - data.caption.length - 5) + '...'
+            }
+            tokens.push({type: "rightAlignedText", value: metaData});
         }
         return tokens;
     };
@@ -338,4 +342,4 @@ dom.importCssString("\
 
 exports.AcePopup = AcePopup;
 
-});
\ No newline at end of file
+});