diff -r 513803cade0a roundup/cgi/KeywordsExpr.py
--- a/roundup/cgi/KeywordsExpr.py	Wed Jul 06 22:19:32 2016 -0400
+++ b/roundup/cgi/KeywordsExpr.py	Thu Jul 07 21:51:28 2016 -0400
@@ -222,14 +222,22 @@
 
 function main_content() {
     var out = '';
+    out += '<span id="MCkeywords_%(prop)s">';
     out += '<input type="hidden" name="%(prop)s" value="' + current + '"\/>';
     out += parse(current).infix();
+    out += '</span>';
     return out;
 }
 
 function modify_main() {
-    main = window.opener.document.getElementById("keywords_%(prop)s");
-    main.innerHTML = main_content();
+    main = window.opener.document.getElementById("MCkeywords_%(prop)s");
+    if ( main == null ) {
+        main = window.opener.document.getElementById("keywords_%(prop)s");
+        select = main.getElementsByTagName("SELECT")[0];
+        select.outerHTML = main_content();
+    } else {
+      main.outerHTML = main_content();
+    }
 }
 
 function set_content() {