diff --git a/src/editor/components/scenegraph/Entity.js b/src/editor/components/scenegraph/Entity.js
index cfca0973b..049974a9e 100644
--- a/src/editor/components/scenegraph/Entity.js
+++ b/src/editor/components/scenegraph/Entity.js
@@ -25,10 +25,7 @@ export default class Entity extends React.Component {
 
   toggleVisibility = () => {
     const entity = this.props.entity;
-    const visible =
-      entity.tagName.toLowerCase() === 'a-scene'
-        ? entity.object3D.visible
-        : entity.getAttribute('visible');
+    const visible = entity.object3D.visible;
     AFRAME.INSPECTOR.execute('entityupdate', {
       entity,
       component: 'visible',
@@ -82,10 +79,7 @@ export default class Entity extends React.Component {
     }
 
     // Visibility button.
-    const visible =
-      tagName === 'a-scene'
-        ? entity.object3D.visible
-        : entity.getAttribute('visible');
+    const visible = entity.object3D.visible;
     const visibilityButton = (
       <i
         title="Toggle entity visibility"
diff --git a/src/editor/components/scenegraph/SceneGraph.js b/src/editor/components/scenegraph/SceneGraph.js
index 774b16849..dfd0cae8e 100644
--- a/src/editor/components/scenegraph/SceneGraph.js
+++ b/src/editor/components/scenegraph/SceneGraph.js
@@ -114,6 +114,7 @@ export default class SceneGraph extends React.Component {
         });
         Events.emit('entityselect', entity);
         found = true;
+        break;
       }
     }