diff --git a/browser/devtools/styleinspector/computed-view.js b/browser/devtools/styleinspector/computed-view.js
index 45ea31f5f15..3b8f5657118 100644
--- a/browser/devtools/styleinspector/computed-view.js
+++ b/browser/devtools/styleinspector/computed-view.js
@@ -297,6 +297,8 @@ CssHtmlTree.prototype = {
       return promise.resolve(undefined);
     }
 
+    this.tooltip.hide();
+
     if (aElement === this.viewedElement) {
       return promise.resolve(undefined);
     }
diff --git a/browser/devtools/styleinspector/rule-view.js b/browser/devtools/styleinspector/rule-view.js
index 070ad9eb6ce..ddab24a4a87 100644
--- a/browser/devtools/styleinspector/rule-view.js
+++ b/browser/devtools/styleinspector/rule-view.js
@@ -1429,6 +1429,9 @@ CssRuleView.prototype = {
     this._clearRules();
     this._viewedElement = null;
     this._elementStyle = null;
+
+    this.previewTooltip.hide();
+    this.colorPicker.hide();
   },
 
   /**
diff --git a/browser/devtools/styleinspector/test/browser.ini b/browser/devtools/styleinspector/test/browser.ini
index ac392e3df54..0c6961d1012 100644
--- a/browser/devtools/styleinspector/test/browser.ini
+++ b/browser/devtools/styleinspector/test/browser.ini
@@ -63,3 +63,4 @@ support-files =
   sourcemaps.css.map
   sourcemaps.scss
 [browser_computedview_original_source_link.js]
+[browser_bug946331_close_tooltip_on_new_selection.js]
diff --git a/browser/devtools/styleinspector/test/browser_bug946331_close_tooltip_on_new_selection.js b/browser/devtools/styleinspector/test/browser_bug946331_close_tooltip_on_new_selection.js
new file mode 100644
index 00000000000..29d415943f9
--- /dev/null
+++ b/browser/devtools/styleinspector/test/browser_bug946331_close_tooltip_on_new_selection.js
@@ -0,0 +1,82 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let contentDoc;
+let inspector;
+let ruleView;
+let computedView;
+
+const PAGE_CONTENT = '<div class="one">el 1</div><div class="two">el 2</div>';
+
+function test() {
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, arguments.callee, true);
+    contentDoc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,rule/computed views tooltip hiding test";
+}
+
+function createDocument() {
+  contentDoc.body.innerHTML = PAGE_CONTENT;
+
+  openRuleView((aInspector, aRuleView) => {
+    inspector = aInspector;
+    ruleView = aRuleView;
+    inspector.sidebar.once("computedview-ready", () => {
+      computedView = inspector.sidebar.getWindowForTab("computedview").computedview.view;
+      startTests();
+    });
+  });
+}
+
+function startTests() {
+  inspector.selection.setNode(contentDoc.querySelector(".one"));
+  inspector.once("inspector-updated", testRuleView);
+}
+
+function endTests() {
+  contentDoc = inspector = ruleView = computedView = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function testRuleView() {
+  info("Testing rule view tooltip closes on new selection");
+
+  // Show the rule view tooltip
+  let tooltip = ruleView.previewTooltip;
+  tooltip.show();
+  tooltip.once("shown", () => {
+    // Select a new node and assert that the tooltip closes
+    tooltip.once("hidden", () => {
+      ok(true, "Rule view tooltip closed after a new node got selected");
+      inspector.once("inspector-updated", testComputedView);
+    });
+    inspector.selection.setNode(contentDoc.querySelector(".two"));
+  });
+}
+
+function testComputedView() {
+  info("Testing computed view tooltip closes on new selection");
+
+  inspector.sidebar.select("computedview");
+  computedView = inspector.sidebar.getWindowForTab("computedview").computedview.view;
+
+  // Show the computed view tooltip
+  let tooltip = computedView.tooltip;
+  tooltip.show();
+  tooltip.once("shown", () => {
+    // Select a new node and assert that the tooltip closes
+    tooltip.once("hidden", () => {
+      ok(true, "Computed view tooltip closed after a new node got selected");
+      inspector.once("inspector-updated", endTests);
+    });
+    inspector.selection.setNode(contentDoc.querySelector(".one"));
+  });
+}