diff --git a/src/gui/HitboxEditor.java b/src/gui/HitboxEditor.java
index 2535d36..a8bca01 100644
--- a/src/gui/HitboxEditor.java
+++ b/src/gui/HitboxEditor.java
@@ -74,19 +74,20 @@ public class HitboxEditor extends Editable {
     		selectedEntityName = listGUI.getSelectedName();
     		try {
 				entity = Project.getInstance().getEntityByName(selectedEntityName);
+				image = Project.getInstance().loadImageByName(selectedEntityName);
+	    		//TODO: if(image == null) вызов FileChooser'a и выбор изображения
+	    		canvas.setEntity(entity);
+	    		canvas.setImage(image);
+	    		if(entity.getHitbox().getShape().equals("Rectangle")) {
+	    			canvas.setHitboxRectengleRenderingFunction();
+	    		}
+	    		if(entity.getHitbox().getShape().equals("Circle")) {
+	    			canvas.setHitboxCircleRenderingFunction();
+	    		}
 			} catch (Exception e1) {
 				//logger.severe("Entity with name '"+selectedEntityName+"' was not found! Cannot display it on panel!");
 			}
-    		image = Project.getInstance().loadImageByName(selectedEntityName);
-    		//TODO: if(image == null) вызов FileChooser'a и выбор изображения
-    		canvas.setEntity(entity);
-    		canvas.setImage(image);
-    		if(entity.getHitbox().getShape().equals("Rectangle")) {
-    			canvas.setHitboxRectengleRenderingFunction();
-    		}
-    		if(entity.getHitbox().getShape().equals("Circle")) {
-    			canvas.setHitboxCircleRenderingFunction();
-    		}
+    		
     		canvas.repaint();
 		}
 	}