diff --git a/Perspex.Diagnostics/DevTools.cs b/Perspex.Diagnostics/DevTools.cs
index f1cba06010..df76a45e54 100644
--- a/Perspex.Diagnostics/DevTools.cs
+++ b/Perspex.Diagnostics/DevTools.cs
@@ -70,16 +70,19 @@ namespace Perspex.Diagnostics
                 }
             };
 
-            var detailsView = new ContentControl
+            var detailsView = new ScrollViewer
             {
-                DataTemplates = new DataTemplates
+                Content = new ContentControl
                 {
-                    new DataTemplate<ControlDetails>(CreateDetailsView),
-                },
-                [!ContentControl.ContentProperty] = treeView[!TreeView.SelectedItemProperty]
+                    DataTemplates = new DataTemplates
+                    {
+                        new DataTemplate<ControlDetails>(CreateDetailsView),
+                    },
+                    [!ContentControl.ContentProperty] = treeView[!TreeView.SelectedItemProperty]
                     .Where(x => x != null)
                     .Cast<TreeNode>()
                     .Select(x => new ControlDetails(x.Control)),
+                },
                 [Grid.ColumnProperty] = 2,
             };