diff --git a/closure/goog/ui/editor/BUILD b/closure/goog/ui/editor/BUILD
index 959d716727..d9a4fa9eba 100644
--- a/closure/goog/ui/editor/BUILD
+++ b/closure/goog/ui/editor/BUILD
@@ -26,18 +26,20 @@ closure_js_library(
         "//closure/goog/asserts",
         "//closure/goog/dom",
         "//closure/goog/dom:classlist",
+        "//closure/goog/dom:safe",
         "//closure/goog/dom:tagname",
         "//closure/goog/dom:viewportsizemonitor",
         "//closure/goog/editor:style",
-        "//closure/goog/events:eventhandler",
         "//closure/goog/events:eventtarget",
         "//closure/goog/events:eventtype",
         "//closure/goog/functions",
+        "//closure/goog/html:safehtml",
         "//closure/goog/log",
         "//closure/goog/math:box",
         "//closure/goog/object",
         "//closure/goog/positioning",
         "//closure/goog/string",
+        "//closure/goog/string:const",
         "//closure/goog/style",
         "//closure/goog/ui:component",
         "//closure/goog/ui:popupbase",
diff --git a/closure/goog/ui/editor/bubble.js b/closure/goog/ui/editor/bubble.js
index 6949eaa7e6..8f0a94acc5 100644
--- a/closure/goog/ui/editor/bubble.js
+++ b/closure/goog/ui/editor/bubble.js
@@ -19,6 +19,7 @@ goog.require('goog.dom');
 goog.require('goog.dom.TagName');
 goog.require('goog.dom.ViewportSizeMonitor');
 goog.require('goog.dom.classlist');
+goog.require('goog.dom.safe');
 goog.require('goog.editor.style');
 goog.require('goog.events.EventHandler');
 goog.require('goog.events.EventTarget');
@@ -32,6 +33,7 @@ goog.require('goog.positioning.Corner');
 goog.require('goog.positioning.Overflow');
 goog.require('goog.positioning.OverflowStatus');
 goog.require('goog.string');
+goog.require('goog.string.Const');
 goog.require('goog.style');
 goog.require('goog.ui.Component');
 goog.require('goog.ui.PopupBase');
@@ -108,8 +110,9 @@ goog.ui.editor.Bubble = function(parent, zIndex) {
    */
   this.closeBox_ = this.dom_.createDom(goog.dom.TagName.DIV, {
     'className': goog.getCssName('tr_bubble_closebox'),
-    'innerHTML': ' '
   });
+  goog.dom.safe.setInnerHtmlFromConstant(
+      this.closeBox_, goog.string.Const.from(' '));
   this.bubbleContents_.appendChild(this.closeBox_);
 
   // We make bubbles unselectable so that clicking on them does not steal focus