diff --git a/app/components/component-tree-toolbar.hbs b/app/components/component-tree-toolbar.hbs
index 931a90be61..c18761403d 100644
--- a/app/components/component-tree-toolbar.hbs
+++ b/app/components/component-tree-toolbar.hbs
@@ -2,6 +2,7 @@
   <button
     class="{{if @isInspecting "active"}} toolbar-icon-button"
     type="button"
+    title="Select element"
     {{on "click" @toggleInspect}}
   >
     {{svg-jar "inspect" width="16px" height="17px"}}
diff --git a/app/components/render-item.ts b/app/components/render-item.ts
index 5cc881749e..669d8609d6 100644
--- a/app/components/render-item.ts
+++ b/app/components/render-item.ts
@@ -13,6 +13,8 @@ interface RenderItemArgs {
   target: { level: number };
 }
 
+export const indentItem = (level: number) => +level * 20 + 5;
+
 export default class RenderItem extends Component<RenderItemArgs> {
   get hasChildren() {
     return Number(this.args.model?.children?.length) > 0;
@@ -25,7 +27,7 @@ export default class RenderItem extends Component<RenderItemArgs> {
   }
 
   get nameStyle() {
-    return htmlSafe(`padding-left: ${+this.level * 20 + 5}px;`);
+    return htmlSafe(`padding-left: ${indentItem(this.level)}px;`);
   }
 
   get nodeStyle() {
diff --git a/app/components/scroll-container.js b/app/components/scroll-container.js
index 2208b11684..01a594a9f3 100644
--- a/app/components/scroll-container.js
+++ b/app/components/scroll-container.js
@@ -5,6 +5,7 @@ import { action } from '@ember/object';
 import { debounce } from '@ember/runloop';
 import { htmlSafe } from '@ember/template';
 import { tracked } from '@glimmer/tracking';
+import { indentItem } from './render-item';
 
 export default class ScrollContainerComponent extends Component {
   attributeBindings = ['style'];
@@ -26,19 +27,23 @@ export default class ScrollContainerComponent extends Component {
   }
 
   get scrollTargetStyle() {
-    let { index, itemHeight } = this;
+    let { index, itemHeight, currentItem, previewing } = this;
 
     if (index === -1) {
       return htmlSafe('display: none;');
     } else {
+      const level = currentItem?.level ?? 0;
+      const left = indentItem(level);
+      const height = itemHeight ?? 0;
+
       return htmlSafe(`
         position: absolute;
         width: 100%;
-        height: ${itemHeight || 0}px;
+        height: ${height}px;
         margin: 0px;
         padding: 0px;
-        top: ${index * itemHeight || 0}px;
-        left: 0px;
+        top: ${index * height}px;
+        ${previewing ? '' : `left: ${left}px;`}
         z-index: -9999;
         pointer-events: none;
       `);
@@ -87,7 +92,7 @@ export default class ScrollContainerComponent extends Component {
 
     if (needsScroll(element, scrollTarget)) {
       scrollTarget.scrollIntoView({
-        behavior: 'auto',
+        behavior: 'smooth',
         block: 'nearest',
         inline: 'nearest',
       });
@@ -96,10 +101,25 @@ export default class ScrollContainerComponent extends Component {
 }
 
 function needsScroll(container, target) {
-  if (!container || !target) return false;
+  if (!container || !target) {
+    return false;
+  }
 
-  let { top: containerTop, bottom: containerBottom } =
-    container.getBoundingClientRect();
-  let { top: targetTop, bottom: targetBottom } = target.getBoundingClientRect();
-  return targetTop < containerTop || targetBottom > containerBottom;
+  let {
+    top: containerTop,
+    bottom: containerBottom,
+    left: containerLeft,
+  } = container.getBoundingClientRect();
+
+  let {
+    top: targetTop,
+    bottom: targetBottom,
+    left: targetLeft,
+  } = target.getBoundingClientRect();
+
+  return (
+    targetTop < containerTop ||
+    targetBottom > containerBottom ||
+    targetLeft != containerLeft
+  );
 }