diff --git a/src/asset_manager/index.js b/src/asset_manager/index.js
index 9f51c4ce7..35469ec16 100644
--- a/src/asset_manager/index.js
+++ b/src/asset_manager/index.js
@@ -228,8 +228,7 @@ export default () => {
 
     /**
      * Render assets
-     * @param  {array} assets Assets to render, without the argument will render
-     *                        all global assets
+     * @param  {array} assets Assets to render, without the argument will render all global assets
      * @return {HTMLElement}
      * @example
      * // Render all assets
@@ -243,8 +242,6 @@ export default () => {
      */
     render(assts) {
       const toRender = assts || this.getAll().models;
-      fu && fu.remove();
-      am && am.remove();
 
       if (!am) {
         const obj = {
@@ -255,9 +252,6 @@ export default () => {
         fu = new FileUpload(obj);
         obj.fu = fu;
         am = new AssetsView(obj);
-      }
-
-      if (!am.rendered) {
         am.render();
       }
 
diff --git a/src/asset_manager/view/AssetsView.js b/src/asset_manager/view/AssetsView.js
index a7fbd7b53..42987d507 100644
--- a/src/asset_manager/view/AssetsView.js
+++ b/src/asset_manager/view/AssetsView.js
@@ -182,7 +182,6 @@ export default Backbone.View.extend({
     this.$el.append(fuRendered).append(this.template(this));
     this.el.className = `${this.ppfx}asset-manager`;
     this.renderAssets();
-    this.rendered = 1;
     return this;
   }
 });
diff --git a/src/commands/view/OpenAssets.js b/src/commands/view/OpenAssets.js
index d1d3559b8..5f03b4ff9 100644
--- a/src/commands/view/OpenAssets.js
+++ b/src/commands/view/OpenAssets.js
@@ -13,7 +13,7 @@ export default {
     am.onSelect(opts.onSelect);
 
     if (!this.rendered || types) {
-      let assets = am.getAll().filter(i => 1);
+      let assets = am.getAll().filter(i => i);
 
       if (types && types.length) {
         assets = assets.filter(a => types.indexOf(a.get('type')) !== -1);
@@ -30,18 +30,7 @@ export default {
       uploadEl && uploadEl.setAttribute('accept', accept);
     }
 
-    modal
-      .open({
-        title,
-        content: this.rendered
-      })
-      .getModel()
-      .once('change:open', () => editor.stopCommand(this.id));
-    return this;
-  },
-
-  stop(editor) {
-    editor.Modal.close();
+    modal.open({ title, content: this.rendered });
     return this;
   }
 };