diff --git a/dist/entry.js b/dist/entry.js
index 9763677833..169196224c 100644
--- a/dist/entry.js
+++ b/dist/entry.js
@@ -9313,14 +9313,13 @@ Entry.Playground.prototype.clonePicture = function(a) {
   this.addPicture(a, !0);
 };
 Entry.Playground.prototype.selectPicture = function(a) {
-  if (a) {
-    for (var b = this.object.pictures, c = 0, d = b.length;c < d;c++) {
-      var e = b[c];
-      e.id === a.id ? e.view.addClass("entryPictureSelected") : e.view.removeClass("entryPictureSelected");
-    }
-    b = Entry.container.selectPicture(a.id);
-    this.object.id === b && Entry.dispatchEvent("pictureSelected", a);
+  for (var b = this.object.pictures, c = 0, d = b.length;c < d;c++) {
+    var e = b[c];
+    e.id === a.id ? e.view.addClass("entryPictureSelected") : e.view.removeClass("entryPictureSelected");
   }
+  var f;
+  a && a.id && (f = Entry.container.selectPicture(a.id));
+  this.object.id === f && Entry.dispatchEvent("pictureSelected", a);
 };
 Entry.Playground.prototype.movePicture = function(a, b) {
   this.object.pictures.splice(b, 0, this.object.pictures.splice(a, 1)[0]);
diff --git a/dist/entry.min.js b/dist/entry.min.js
index e925df8edf..877cddec83 100644
--- a/dist/entry.min.js
+++ b/dist/entry.min.js
@@ -862,7 +862,7 @@ Entry.Playground.prototype.injectObject=function(a){if(!a)this.changeViewMode("c
 Entry.Playground.prototype.injectCode=function(){var a=this.object;Blockly.mainWorkspace.clear();Blockly.Xml.domToWorkspace(Blockly.mainWorkspace,a.script)};Entry.Playground.prototype.injectPicture=function(){var a=this.pictureListView_;if(a){for(;a.hasChildNodes();)a.removeChild(a.lastChild);if(this.object){for(var b=this.object.pictures,c=0,d=b.length;c<d;c++){var e=b[c].view;e||console.log(e);e.orderHolder.innerHTML=c+1;a.appendChild(e)}this.selectPicture(this.object.selectedPicture)}else Entry.dispatchEvent("pictureClear")}};
 Entry.Playground.prototype.addPicture=function(a,b){var c=Entry.cloneSimpleObject(a);delete c.id;delete c.view;a=JSON.parse(JSON.stringify(c));a.id=Entry.generateHash();a.name=Entry.getOrderedName(a.name,this.object.pictures);this.generatePictureElement(a);this.object.addPicture(a);this.injectPicture();this.selectPicture(a)};
 Entry.Playground.prototype.setPicture=function(a){var b=Entry.container.getPictureElement(a.id),c=$(b);if(b){a.view=b;b.picture=a;b=c.find("#t_"+a.id)[0];if(a.fileurl)b.style.backgroundImage='url("'+a.fileurl+'")';else{var d=a.filename;b.style.backgroundImage='url("/uploads/'+d.substring(0,2)+"/"+d.substring(2,4)+"/thumb/"+d+'.png")'}c.find("#s_"+a.id)[0].innerHTML=a.dimension.width+" X "+a.dimension.height}Entry.container.setPicture(a)};
-Entry.Playground.prototype.clonePicture=function(a){a=Entry.playground.object.getPicture(a);this.addPicture(a,!0)};Entry.Playground.prototype.selectPicture=function(a){if(a){for(var b=this.object.pictures,c=0,d=b.length;c<d;c++){var e=b[c];e.id===a.id?e.view.addClass("entryPictureSelected"):e.view.removeClass("entryPictureSelected")}b=Entry.container.selectPicture(a.id);this.object.id===b&&Entry.dispatchEvent("pictureSelected",a)}};
+Entry.Playground.prototype.clonePicture=function(a){a=Entry.playground.object.getPicture(a);this.addPicture(a,!0)};Entry.Playground.prototype.selectPicture=function(a){for(var b=this.object.pictures,c=0,d=b.length;c<d;c++){var e=b[c];e.id===a.id?e.view.addClass("entryPictureSelected"):e.view.removeClass("entryPictureSelected")}var f;a&&a.id&&(f=Entry.container.selectPicture(a.id));this.object.id===f&&Entry.dispatchEvent("pictureSelected",a)};
 Entry.Playground.prototype.movePicture=function(a,b){this.object.pictures.splice(b,0,this.object.pictures.splice(a,1)[0]);this.injectPicture();Entry.stage.sortZorder()};
 Entry.Playground.prototype.injectText=function(){if(Entry.playground.object){Entry.playground.textEditInput.value=Entry.playground.object.entity.getText();Entry.playground.textEditArea.value=Entry.playground.object.entity.getText();Entry.playground.fontName_.value=Entry.playground.object.entity.getFontName();if(Entry.playground.object.entity.font){var a=-1<Entry.playground.object.entity.font.indexOf("bold")||!1;$("#entryPlaygroundText_boldImage").attr("src",Entry.mediaFilePath+"text_button_bold_"+
 a+".png");a=-1<Entry.playground.object.entity.font.indexOf("italic")||!1;$("#entryPlaygroundText_italicImage").attr("src",Entry.mediaFilePath+"text_button_italic_"+a+".png")}a=Entry.playground.object.entity.getUnderLine()||!1;$("#entryPlaygroundText_underlineImage").attr("src",Entry.mediaFilePath+"text_button_underline_"+a+".png");a=Entry.playground.object.entity.getStrike()||!1;$("#entryPlaygroundText_strikeImage").attr("src",Entry.mediaFilePath+"text_button_strike_"+a+".png");$(".entryPlayground_fgColorDiv").css("backgroundColor",
diff --git a/src/playground.js b/src/playground.js
index 00483ca105..7f557055ed 100644
--- a/src/playground.js
+++ b/src/playground.js
@@ -987,9 +987,6 @@ Entry.Playground.prototype.clonePicture = function(pictureId) {
  * @param {picture}
  */
 Entry.Playground.prototype.selectPicture = function(picture) {
-    if(!picture) {
-        return;
-    }
     var pictures = this.object.pictures;
     for (var i = 0, len=pictures.length; i<len; i++) {
         var target = pictures[i];
@@ -999,7 +996,10 @@ Entry.Playground.prototype.selectPicture = function(picture) {
             target.view.removeClass('entryPictureSelected');
     }
 
-    var objectId_ = Entry.container.selectPicture(picture.id);
+    var objectId_;
+    if(picture && picture.id) {
+        objectId_ = Entry.container.selectPicture(picture.id);
+    }
 
     if( this.object.id === objectId_) {
         Entry.dispatchEvent('pictureSelected', picture);