diff --git a/dist/entry.js b/dist/entry.js
index 846e95a2ef..0e16a34ce7 100644
--- a/dist/entry.js
+++ b/dist/entry.js
@@ -7005,7 +7005,8 @@ Entry.Container.prototype.removeObject = function(b) {
   this.objects_.splice(a, 1);
   this.setCurrentObjects();
   Entry.stage.sortZorder();
-  this.objects_.length && 0 !== a ? 0 < this.getCurrentObjects().length ? Entry.container.selectObject(this.getCurrentObjects()[0].id) : Entry.container.selectObject() : this.objects_.length && 0 === a ? Entry.container.selectObject(this.getCurrentObjects()[0].id) : (Entry.container.selectObject(), Entry.playground.flushPlayground());
+  a = this.getCurrentObjects();
+  a.length ? this.selectObject(a[0].id) : (this.selectObject(), Entry.playground.flushPlayground());
   Entry.toast.success(Lang.Workspace.remove_object, b.name + " " + Lang.Workspace.remove_object_msg);
   Entry.variableContainer.removeLocalVariables(b.id);
   Entry.playground.reloadPlayground();
diff --git a/dist/entry.min.js b/dist/entry.min.js
index a928020749..73cf875aeb 100644
--- a/dist/entry.min.js
+++ b/dist/entry.min.js
@@ -774,10 +774,9 @@ Entry.Container.prototype.selectPicture=function(b,a){var d=this.getObject(a),c=
 Entry.Container.prototype.addObject=function(b,a){var d=new Entry.EntryObject(b);d.name=Entry.getOrderedName(d.name,this.objects_);Entry.stateManager&&Entry.stateManager.addCommand("add object",this,this.removeObject,d);d.scene||(d.scene=Entry.scene.selectedScene);"number"==typeof a?b.sprite.category&&"background"==b.sprite.category.main?(d.setLock(!0),this.objects_.push(d)):this.objects_.splice(a,0,d):b.sprite.category&&"background"==b.sprite.category.main?this.objects_.push(d):this.objects_.unshift(d);
 d.generateView();d.pictures.map(function(a){Entry.playground.generatePictureElement(a)});d.sounds.map(function(a){Entry.playground.generateSoundElement(a)});this.setCurrentObjects();this.updateObjectsOrder();this.updateListView();this.selectObject(d.id);Entry.variableContainer.updateViews();return new Entry.State(this,this.removeObject,d)};
 Entry.Container.prototype.addCloneObject=function(b,a){var d=b.toJSON(),c=Entry.generateHash();Entry.variableContainer.addCloneLocalVariables({objectId:d.id,newObjectId:c,json:d});d.id=c;d.scene=a||Entry.scene.selectedScene;this.addObject(d)};
-Entry.Container.prototype.removeObject=function(b){var a=this.objects_.indexOf(b),d=b.toJSON();Entry.stateManager&&Entry.stateManager.addCommand("remove object",this,this.addObject,d,a);d=new Entry.State(this.addObject,d,a);b.destroy();this.objects_.splice(a,1);this.setCurrentObjects();Entry.stage.sortZorder();this.objects_.length&&0!==a?0<this.getCurrentObjects().length?Entry.container.selectObject(this.getCurrentObjects()[0].id):Entry.container.selectObject():this.objects_.length&&0===a?Entry.container.selectObject(this.getCurrentObjects()[0].id):
-(Entry.container.selectObject(),Entry.playground.flushPlayground());Entry.toast.success(Lang.Workspace.remove_object,b.name+" "+Lang.Workspace.remove_object_msg);Entry.variableContainer.removeLocalVariables(b.id);Entry.playground.reloadPlayground();return d};
-Entry.Container.prototype.selectObject=function(b,a){var d=this.getObject(b);a&&d&&Entry.scene.selectScene(d.scene);this.mapObjectOnScene(function(a){a.view_&&a.view_.removeClass("selectedObject");a.isSelected_=!1});d&&(d.view_&&d.view_.addClass("selectedObject"),d.isSelected_=!0);Entry.playground&&Entry.playground.injectObject(d);"minimize"!=Entry.type&&Entry.engine.isState("stop")&&Entry.stage.selectObject(d)};Entry.Container.prototype.getAllObjects=function(){return this.objects_};
-Entry.Container.prototype.getObject=function(b){!b&&Entry.playground&&Entry.playground.object&&(b=Entry.playground.object.id);for(var a=this.objects_.length,d=0;d<a;d++){var c=this.objects_[d];if(c.id==b)return c}};Entry.Container.prototype.getEntity=function(b){if(b=this.getObject(b))return b.entity;Entry.toast.alert(Lang.Msgs.runtime_error,Lang.Workspace.object_not_found,!0)};
+Entry.Container.prototype.removeObject=function(b){var a=this.objects_.indexOf(b),d=b.toJSON();Entry.stateManager&&Entry.stateManager.addCommand("remove object",this,this.addObject,d,a);d=new Entry.State(this.addObject,d,a);b.destroy();this.objects_.splice(a,1);this.setCurrentObjects();Entry.stage.sortZorder();a=this.getCurrentObjects();a.length?this.selectObject(a[0].id):(this.selectObject(),Entry.playground.flushPlayground());Entry.toast.success(Lang.Workspace.remove_object,b.name+" "+Lang.Workspace.remove_object_msg);
+Entry.variableContainer.removeLocalVariables(b.id);Entry.playground.reloadPlayground();return d};Entry.Container.prototype.selectObject=function(b,a){var d=this.getObject(b);a&&d&&Entry.scene.selectScene(d.scene);this.mapObjectOnScene(function(a){a.view_&&a.view_.removeClass("selectedObject");a.isSelected_=!1});d&&(d.view_&&d.view_.addClass("selectedObject"),d.isSelected_=!0);Entry.playground&&Entry.playground.injectObject(d);"minimize"!=Entry.type&&Entry.engine.isState("stop")&&Entry.stage.selectObject(d)};
+Entry.Container.prototype.getAllObjects=function(){return this.objects_};Entry.Container.prototype.getObject=function(b){!b&&Entry.playground&&Entry.playground.object&&(b=Entry.playground.object.id);for(var a=this.objects_.length,d=0;d<a;d++){var c=this.objects_[d];if(c.id==b)return c}};Entry.Container.prototype.getEntity=function(b){if(b=this.getObject(b))return b.entity;Entry.toast.alert(Lang.Msgs.runtime_error,Lang.Workspace.object_not_found,!0)};
 Entry.Container.prototype.getVariable=function(b){for(var a=0;a<this.variables_.length;a++){var d=this.variables_[a];if(d.getId()==b||d.getName()==b)return d}};
 Entry.Container.prototype.moveElement=function(b,a,d){var c;c=this.getCurrentObjects();b=this.getAllObjects().indexOf(c[b]);a=this.getAllObjects().indexOf(c[a]);!d&&Entry.stateManager&&Entry.stateManager.addCommand("reorder object",Entry.container,Entry.container.moveElement,a,b,!0);this.objects_.splice(a,0,this.objects_.splice(b,1)[0]);this.setCurrentObjects();Entry.container.updateListView();Entry.requestUpdate=!0;return new Entry.State(Entry.container,Entry.container.moveElement,a,b,!0)};
 Entry.Container.prototype.moveElementByBlock=function(b,a){var d=this.getCurrentObjects().splice(b,1)[0];this.getCurrentObjects().splice(a,0,d);Entry.stage.sortZorder();this.updateListView()};
diff --git a/src/container.js b/src/container.js
index bbeb565195..7beb7877df 100644
--- a/src/container.js
+++ b/src/container.js
@@ -341,29 +341,19 @@ Entry.Container.prototype.removeObject = function(object) {
             index
         );
     }
-    var state = new Entry.State(
-                                this.addObject,
-                                objectJSON,
-                                index
-                               );
+    var state =
+        new Entry.State(this.addObject, objectJSON, index);
+
     object.destroy();
     this.objects_.splice(index, 1);
     this.setCurrentObjects();
     Entry.stage.sortZorder();
+    var currentObjects = this.getCurrentObjects();
 
-    if (this.objects_.length && index !== 0) {
-        // Entry.container.selectObject(this.objects_[index -1].id);
-        var currentObjects_ = this.getCurrentObjects();
-        if(currentObjects_.length > 0) {
-            Entry.container.selectObject(this.getCurrentObjects()[0].id);
-        } else {
-            Entry.container.selectObject();
-        }
-    }
-    else if (this.objects_.length && index === 0)
-        Entry.container.selectObject(this.getCurrentObjects()[0].id);
+    if (currentObjects.length)
+        this.selectObject(currentObjects[0].id);
     else {
-        Entry.container.selectObject();
+        this.selectObject();
         Entry.playground.flushPlayground();
     }