diff --git a/code/boot.js b/code/boot.js
index 1f75b734..98797f09 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -453,6 +453,7 @@ window.setupSidebarToggle = function() {
       toggle.html('<span class="toggle close"></span>');
       toggle.css('right', SIDEBAR_WIDTH+1+'px');
     }
+    $('.ui-tooltip').remove();
   });
 }
 
@@ -463,6 +464,7 @@ window.setupTooltips = function(element) {
     show: { effect: "hide", duration: 0 } ,
     hide: false,
     open: function(event, ui) {
+      $(".ui-tooltip").not(ui.tooltip).remove();
       ui.tooltip.delay(300).fadeIn(0);
     },
     content: function() {
diff --git a/code/search.js b/code/search.js
index 1b4e9aed..e48ec4dd 100644
--- a/code/search.js
+++ b/code/search.js
@@ -190,7 +190,7 @@ window.search.doSearch = function(term, confirmed) {
 
   if(useAndroidPanes()) show('info');
 
-  $('#search').tooltip().tooltip('close');
+  $('.ui-tooltip').remove();
 
   window.search.lastSearch = new window.search.Query(term, confirmed);
   window.search.lastSearch.show();