diff --git a/modules/inspector/prop-list.c b/modules/inspector/prop-list.c
index 6c78777ddc..68d507432f 100644
--- a/modules/inspector/prop-list.c
+++ b/modules/inspector/prop-list.c
@@ -53,9 +53,10 @@ struct _GtkInspectorPropListPrivate
   GtkCellRenderer *value_renderer;
   gboolean child_properties;
   GtkTreeViewColumn *attribute_column;
+  GtkWidget *tree;
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorPropList, gtk_inspector_prop_list, GTK_TYPE_TREE_VIEW)
+G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorPropList, gtk_inspector_prop_list, GTK_TYPE_BOX)
 
 static void
 gtk_inspector_prop_list_init (GtkInspectorPropList *pl)
@@ -143,6 +144,7 @@ gtk_inspector_prop_list_class_init (GtkInspectorPropListClass *klass)
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, model);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, value_renderer);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, attribute_column);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, tree);
 }
 
 static void
@@ -214,7 +216,7 @@ gtk_inspector_prop_list_prop_changed_cb (GObject              *pspec,
                                          GParamSpec           *prop,
                                          GtkInspectorPropList *pl)
 {
-  GtkTreeIter *iter = g_hash_table_lookup(pl->priv->prop_iters, prop->name);
+  GtkTreeIter *iter = g_hash_table_lookup (pl->priv->prop_iters, prop->name);
 
   if (iter != NULL)
     gtk_inspector_prop_list_update_prop (pl, iter, prop);
diff --git a/modules/inspector/prop-list.h b/modules/inspector/prop-list.h
index c9dc42caeb..6552c4ef61 100644
--- a/modules/inspector/prop-list.h
+++ b/modules/inspector/prop-list.h
@@ -38,13 +38,13 @@ typedef struct _GtkInspectorPropListPrivate GtkInspectorPropListPrivate;
 
 typedef struct _GtkInspectorPropList
 {
-  GtkTreeView parent;
+  GtkBox parent;
   GtkInspectorPropListPrivate *priv;
 } GtkInspectorPropList;
 
 typedef struct _GtkInspectorPropListClass
 {
-  GtkTreeViewClass parent;
+  GtkBoxClass parent;
 } GtkInspectorPropListClass;
 
 
diff --git a/modules/inspector/prop-list.ui b/modules/inspector/prop-list.ui
index 36c16dcf52..d477c75406 100644
--- a/modules/inspector/prop-list.ui
+++ b/modules/inspector/prop-list.ui
@@ -11,73 +11,89 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <template class="GtkInspectorPropList" parent="GtkTreeView">
-    <property name="model">model</property>
-    <property name="tooltip-column">4</property>
+  <template class="GtkInspectorPropList" parent="GtkBox">
+    <property name="orientation">vertical</property>
     <child>
-      <object class="GtkTreeViewColumn">
-        <property name="title" translatable="yes">Property</property>
-        <property name="resizable">True</property>
-        <property name="sort-order">ascending</property>
-        <property name="sort-column-id">0</property>
+      <object class="GtkScrolledWindow">
+        <property name="visible">True</property>
+        <property name="expand">True</property>
+        <property name="hscrollbar-policy">automatic</property>
+        <property name="vscrollbar-policy">always</property>
+        <property name="shadow-type">in</property>
+        <property name="width-request">250</property>
         <child>
-          <object class="GtkCellRendererText">
-            <property name="scale">0.8</property>
+          <object class="GtkTreeView" id="tree">
+            <property name="visible">True</property>
+            <property name="model">model</property>
+            <property name="tooltip-column">4</property>
+            <child>
+              <object class="GtkTreeViewColumn">
+                <property name="title" translatable="yes">Property</property>
+                <property name="resizable">True</property>
+                <property name="sort-order">ascending</property>
+                <property name="sort-column-id">0</property>
+                <child>
+                  <object class="GtkCellRendererText">
+                    <property name="scale">0.8</property>
+                  </object>
+                  <attributes>
+                    <attribute name="text">0</attribute>
+                    <attribute name="sensitive">5</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn">
+                <property name="title" translatable="yes">Value</property>
+                <property name="resizable">True</property>
+                <child>
+                  <object class="GtkInspectorPropertyCellRenderer" id="value_renderer">
+                    <property name="scale">0.8</property>
+                    <property name="editable">True</property>
+                    <property name="width-chars">20</property>
+                    <property name="ellipsize">end</property>
+                  </object>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                    <attribute name="object">3</attribute>
+                    <attribute name="name">0</attribute>
+                    <attribute name="sensitive">5</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="attribute_column">
+                <property name="title" translatable="yes">Attribute</property>
+                <property name="resizable">True</property>
+                <child>
+                  <object class="GtkCellRendererText">
+                    <property name="scale">0.8</property>
+                    <property name="editable">False</property>
+                  </object>
+                  <attributes>
+                    <attribute name="text">6</attribute>
+                    <attribute name="sensitive">5</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn">
+                <property name="title" translatable="yes">Defined At</property>
+                <child>
+                  <object class="GtkCellRendererText">
+                    <property name="scale">0.8</property>
+                  </object>
+                  <attributes>
+                    <attribute name="text">2</attribute>
+                    <attribute name="sensitive">5</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
           </object>
-          <attributes>
-            <attribute name="text">0</attribute>
-            <attribute name="sensitive">5</attribute>
-          </attributes>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkTreeViewColumn">
-        <property name="title" translatable="yes">Value</property>
-        <property name="resizable">True</property>
-        <child>
-          <object class="GtkInspectorPropertyCellRenderer" id="value_renderer">
-            <property name="scale">0.8</property>
-            <property name="editable">True</property>
-            <property name="width-chars">20</property>
-            <property name="ellipsize">end</property>
-          </object>
-          <attributes>
-            <attribute name="text">1</attribute>
-            <attribute name="object">3</attribute>
-            <attribute name="name">0</attribute>
-            <attribute name="sensitive">5</attribute>
-          </attributes>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkTreeViewColumn" id="attribute_column">
-        <property name="title" translatable="yes">Attribute</property>
-        <property name="resizable">True</property>
-        <child>
-          <object class="GtkCellRendererText">
-            <property name="scale">0.8</property>
-            <property name="editable">False</property>
-          </object>
-          <attributes>
-            <attribute name="text">6</attribute>
-            <attribute name="sensitive">5</attribute>
-          </attributes>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkTreeViewColumn">
-        <property name="title" translatable="yes">Defined At</property>
-        <child>
-          <object class="GtkCellRendererText">
-            <property name="scale">0.8</property>
-          </object>
-          <attributes>
-            <attribute name="text">2</attribute>
-            <attribute name="sensitive">5</attribute>
-          </attributes>
         </child>
       </object>
     </child>
diff --git a/modules/inspector/window.ui b/modules/inspector/window.ui
index 7ac4ab43a9..c9b9a47638 100644
--- a/modules/inspector/window.ui
+++ b/modules/inspector/window.ui
@@ -118,19 +118,10 @@
                     <property name="show-border">False</property>
                     <property name="scrollable">True</property>
                     <child>
-                      <object class="GtkScrolledWindow">
+                      <object class="GtkInspectorPropList" id="prop_list">
                         <property name="visible">True</property>
-                        <property name="hscrollbar-policy">automatic</property>
-                        <property name="vscrollbar-policy">always</property>
-                        <property name="shadow-type">in</property>
-                        <property name="width-request">250</property>
-                        <child>
-                          <object class="GtkInspectorPropList" id="prop_list">
-                            <property name="visible">True</property>
-                            <property name="child-properties">False</property>
-                            <property name="widget-tree">widget_tree</property>
-                          </object>
-                        </child>
+                        <property name="child-properties">False</property>
+                        <property name="widget-tree">widget_tree</property>
                       </object>
                     </child>
                     <child type="tab">
@@ -140,19 +131,10 @@
                       </object>
                     </child> 
                     <child>
-                      <object class="GtkScrolledWindow">
+                      <object class="GtkInspectorPropList" id="child_prop_list">
                         <property name="visible">True</property>
-                        <property name="hscrollbar-policy">automatic</property>
-                        <property name="vscrollbar-policy">always</property>
-                        <property name="shadow-type">in</property>
-                        <property name="width-request">250</property>
-                        <child>
-                          <object class="GtkInspectorPropList" id="child_prop_list">
-                            <property name="visible">True</property>
-                            <property name="child-properties">True</property>
-                            <property name="widget-tree">widget_tree</property>
-                          </object>
-                        </child>
+                        <property name="child-properties">True</property>
+                        <property name="widget-tree">widget_tree</property>
                       </object>
                     </child>
                     <child type="tab">