diff --git a/packages/frontend/src/main/components/viewer/ObjectSelection.vue b/packages/frontend/src/main/components/viewer/ObjectSelection.vue
index 087d207d3..8e44cc1fb 100644
--- a/packages/frontend/src/main/components/viewer/ObjectSelection.vue
+++ b/packages/frontend/src/main/components/viewer/ObjectSelection.vue
@@ -6,10 +6,10 @@
     }; height: 100vh; position: absolute; padding-top: 72px`"
   >
     <div
-      style="height: 100vh; overflow-y: auto; pointer-events: auto"
+      style="max-height: 100%; overflow-y: auto; pointer-events: auto"
       class="simple-scrollbar"
     >
-      <div class="d-flex align-center">
+      <div class="d-flex align-center" style="max-width: 99%">
         <span class="caption">Selection Info</span>
         <v-spacer />
         <v-btn
diff --git a/packages/viewer/src/modules/tree/RenderTree.ts b/packages/viewer/src/modules/tree/RenderTree.ts
index eac9aaaf9..089322ea8 100644
--- a/packages/viewer/src/modules/tree/RenderTree.ts
+++ b/packages/viewer/src/modules/tree/RenderTree.ts
@@ -114,7 +114,7 @@ export class RenderTree {
 
     return (parent ? parent : node.parent)
       .all((_node: TreeNode): boolean => {
-        return _node.model.renderView !== null && _node.model.renderView.hasGeometry
+        return _node.model.renderView && _node.model.renderView.hasGeometry
       })
       .map((val: TreeNode) => val.model.renderView)
   }
@@ -125,7 +125,7 @@ export class RenderTree {
     }
 
     return (parent ? parent : node.parent).all((_node: TreeNode): boolean => {
-      return _node.model.renderView !== null && _node.model.renderView.hasGeometry
+      return _node.model.renderView && _node.model.renderView.hasGeometry
     })
   }