diff --git a/addons/web_editor/static/src/js/wysiwyg/plugin/media.js b/addons/web_editor/static/src/js/wysiwyg/plugin/media.js
index e60cfbe8039..2cdfbe70cfe 100644
--- a/addons/web_editor/static/src/js/wysiwyg/plugin/media.js
+++ b/addons/web_editor/static/src/js/wysiwyg/plugin/media.js
@@ -86,7 +86,7 @@ var MediaPlugin = AbstractPlugin.extend({
      * @param {Node} target
      */
     update: function (target) {
-        if (!target) {
+        if (!target || !dom.isMedia(target)) {
             return;
         }
         if (!this.options.displayPopover(target)) {
diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
index 44f7dd2c6a8..3b2a63fa48e 100644
--- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
@@ -610,7 +610,7 @@ var Wysiwyg = Widget.extend({
         this._editableHasFocus = true;
         this._justFocused = true;
         setTimeout(function () {
-            self._justFocused = true;
+            self._justFocused = false;
         });
     },
     /**