diff --git a/editor/js/Editor.js b/editor/js/Editor.js
index d98973d8f1b680c911e3781171e00c07bbc3a370..dcb268912fe2cc47271f407a6ec62e4cbabab06b 100644
--- a/editor/js/Editor.js
+++ b/editor/js/Editor.js
@@ -259,7 +259,19 @@ Editor.prototype = {
 
 	selectById: function ( id ) {
 
-		this.select( this.scene.getObjectById( id, true ) );
+		var object = null;
+
+		this.scene.traverse( function ( child ) {
+
+			if ( child.id === id ) {
+
+				object = child;
+
+			}
+
+		} );
+
+		this.select( object );
 
 	},
 
diff --git a/editor/js/Sidebar.Scene.js b/editor/js/Sidebar.Scene.js
index 77825af27e16dfff9e8363c6e97aeab2b5069556..4b1ebf5d467dbb66fca648d9283bca1387006ae2 100644
--- a/editor/js/Sidebar.Scene.js
+++ b/editor/js/Sidebar.Scene.js
@@ -2,8 +2,6 @@ Sidebar.Scene = function ( editor ) {
 
 	var signals = editor.signals;
 
-	var selected = null;
-
 	var container = new UI.Panel();
 	container.setPadding( '10px' );
 	container.setBorderTop( '1px solid #ccc' );
@@ -169,7 +167,12 @@ Sidebar.Scene = function ( editor ) {
 		} )( scene.children, '   ' );
 
 		outliner.setOptions( options );
-		outliner.setValue( selected );
+
+		if ( editor.selected !== null ) {
+
+			outliner.setValue( editor.selected.id );
+
+		}
 
 		if ( scene.fog ) {
 
@@ -200,9 +203,7 @@ Sidebar.Scene = function ( editor ) {
 
 	signals.objectSelected.add( function ( object ) {
 
-		selected = object !== null ? object.id : null;
-
-		outliner.setValue( selected );
+		outliner.setValue( object.id );
 
 	} );