diff --git a/package.json b/package.json
index 7ddad6a2e4..98cf66a4f2 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "babel-types": "^6.26.0",
     "babylon": "^6.18.0",
     "codemirror": "^5.28.0",
-    "devtools-components": "^0.0.2",
+    "devtools-components": "^0.0.5",
     "devtools-launchpad": "^0.0.100",
     "devtools-linters": "^0.0.3",
     "devtools-reps": "^0.12.3",
diff --git a/src/components/shared/ManagedTree.css b/src/components/shared/ManagedTree.css
index 6fcd0305ee..89cba13e49 100644
--- a/src/components/shared/ManagedTree.css
+++ b/src/components/shared/ManagedTree.css
@@ -8,6 +8,12 @@
   white-space: nowrap;
   overflow: auto;
   min-width: 100%;
+  --tree-indent-border-color: none;
+  --tree-indent-width: 0;
+}
+
+.managed-tree .tree:focus {
+  outline: none;
 }
 
 .managed-tree .tree button {
diff --git a/src/components/shared/ManagedTree.js b/src/components/shared/ManagedTree.js
index a2b4a7fba8..50b8eac20b 100644
--- a/src/components/shared/ManagedTree.js
+++ b/src/components/shared/ManagedTree.js
@@ -2,8 +2,8 @@
 import React, { createFactory, Component } from "react";
 import "./ManagedTree.css";
 
-import { Tree as _Tree } from "devtools-components";
-const Tree = createFactory(_Tree);
+import Components from "devtools-components";
+const Tree = createFactory(Components.Tree);
 
 export type Item = {
   contents: any,
diff --git a/yarn.lock b/yarn.lock
index f9ec5df262..40a1e00cc8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2836,6 +2836,13 @@ devtools-components@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/devtools-components/-/devtools-components-0.0.2.tgz#4eb22cb5140e65741b00b79a7f76454ff56fa501"
 
+devtools-components@^0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/devtools-components/-/devtools-components-0.0.5.tgz#1b0c1718a9c0b6e3415f05377f0e5093aef82d9f"
+  dependencies:
+    svg-inline-loader "^0.8.0"
+    svg-inline-react "^1.0.2"
+
 devtools-config@^0.0.15:
   version "0.0.15"
   resolved "https://registry.yarnpkg.com/devtools-config/-/devtools-config-0.0.15.tgz#1fbe75be3f4dc1159603927fc1dfa64d1d9f1202"