diff --git a/index.html b/index.html
index 5a5462381..4e38cf98b 100755
--- a/index.html
+++ b/index.html
@@ -858,9 +858,9 @@
             }
           },{
             id:   'clean-all',
-            run:   function(editor, sender){
+            run:   function(editor, sender) {
               sender.set('active',false);
-              if(confirm('Are you sure to clean the canvas?')){
+              if(confirm('Are you sure to clean the canvas?')) {
                 var comps = editor.DomComponents.clear();
               }
             }
@@ -1299,7 +1299,6 @@
     editor.on('storage:store', function(e) {
       console.log('STORE ', e);
     })
-
     editor.render();
     </script>
   </body>
diff --git a/src/dom_components/index.js b/src/dom_components/index.js
index 7e6d4de78..fa9f35fde 100644
--- a/src/dom_components/index.js
+++ b/src/dom_components/index.js
@@ -216,7 +216,8 @@ module.exports = () => {
         }catch(err){}
       }else if(d.html)
         obj = d.html;
-      if (obj) {
+
+      if (obj && obj.length) {
         this.clear();
         this.getComponents().reset();
         this.getComponents().add(obj);
diff --git a/src/utils/Sorter.js b/src/utils/Sorter.js
index 90e9db403..a92eee991 100644
--- a/src/utils/Sorter.js
+++ b/src/utils/Sorter.js
@@ -242,7 +242,7 @@ module.exports = Backbone.View.extend({
 
     if (src) {
       var srcModel = this.getSourceModel();
-      srcModel && srcModel.set('status', 'freezed');
+      srcModel && srcModel.set && srcModel.set('status', 'freezed');
       this.$document.on('mouseup', this.endMove);
     }
 
@@ -285,7 +285,7 @@ module.exports = Backbone.View.extend({
         let comps = em.get('DomComponents').getComponents();
         let tempModel = comps.add(dropContent);
         dropModel = comps.remove(tempModel);
-        this.dropModel = dropModel;
+        this.dropModel = dropModel instanceof Array ? dropModel[0] : dropModel;
       }
       return dropModel;
     }
@@ -759,7 +759,7 @@ module.exports = Backbone.View.extend({
 
     if (src) {
       var srcModel = this.getSourceModel();
-      if (srcModel) {
+      if (srcModel && srcModel.set) {
         srcModel.set('status', '');
         srcModel.set('status', 'selected');
       }