diff --git a/src/UI/Content/form.less b/src/UI/Content/form.less
index 86ade923a..66bf13a81 100644
--- a/src/UI/Content/form.less
+++ b/src/UI/Content/form.less
@@ -87,3 +87,19 @@ h3 {
     margin-left: 0px;
   }
 }
+
+// Tooltips
+
+.help-inline-checkbox, .help-inline {
+  .tooltip-inner {
+    white-space : pre-wrap;
+    min-width   : 200px;
+  }
+
+  .help-link ~ .tooltip {
+    .tooltip-inner {
+      white-space : normal;
+      min-width   : 0px;
+    }
+  }
+}
diff --git a/src/UI/Shared/Tooltip.js b/src/UI/Shared/Tooltip.js
index 11906faf9..6cd84d3cc 100644
--- a/src/UI/Shared/Tooltip.js
+++ b/src/UI/Shared/Tooltip.js
@@ -9,17 +9,7 @@ define(
                 console.log('starting signalR');
 
                 $('body').tooltip({
-                    selector: '[title]',
-                    container: 'body'
-                });
-
-                $(document).click(function(e) {
-
-                    if ($(e.target).attr('title') !== undefined) {
-                        return;
-                    }
-
-                    $('.tooltip').remove();
+                    selector: '[title]'
                 });
 
                 return this;