diff --git a/package.json b/package.json
index 1ac079ab7..7e10a11e8 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "atom-keymap": "^5.1.2",
     "atom-space-pen-views": "^2.0.4",
     "babel-core": "^5.1.11",
-    "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
+    "bootstrap": "^3.3.4",
     "clear-cut": "^2.0.1",
     "coffee-cash": "0.8.0",
     "coffee-script": "1.8.0",
diff --git a/static/bootstrap-overrides.less b/static/bootstrap-overrides.less
index 258de6320..df61c0171 100644
--- a/static/bootstrap-overrides.less
+++ b/static/bootstrap-overrides.less
@@ -26,3 +26,9 @@ body {
   font-family: inherit; // inherit from html
   font-size: inherit; // inherit from html
 }
+
+// Latest Bootstrap specifies the font properties again instead of inheriting
+.tooltip {
+  font-family: @font-family;
+  font-size: @font-size;
+}