diff --git a/doc/BUGS b/doc/BUGS
index f18512972..059f5095c 100644
--- a/doc/BUGS
+++ b/doc/BUGS
@@ -4,8 +4,6 @@ Bugs
 - When loading http://www.the-compiler.org:4040/ ssl errors get displayed in
   green because we're in insert mode.
 
-- Escape & in tab-titles (and probably other places too?)
-
 - page-forward clicks "Newest" on http://explosm.net/ instead of "Next".
 
 - seir sometimes sees "-- COMMAND MODE --" even though that should never
diff --git a/qutebrowser/widgets/tabbedbrowser.py b/qutebrowser/widgets/tabbedbrowser.py
index 1d11128ce..9f1a07542 100644
--- a/qutebrowser/widgets/tabbedbrowser.py
+++ b/qutebrowser/widgets/tabbedbrowser.py
@@ -374,7 +374,7 @@ class TabbedBrowser(TabWidget):
                 # We can get signals for tabs we already deleted...
                 log.webview.debug("Got invalid tab {}!".format(tab))
                 return
-            self.setTabText(idx, text)
+            self.setTabText(idx, text.replace('&', '&&'))
             if idx == self.currentIndex():
                 self.title_changed.emit('{} - qutebrowser'.format(text))
         else:
@@ -394,7 +394,7 @@ class TabbedBrowser(TabWidget):
             log.webview.debug("Got invalid tab {}!".format(tab))
             return
         if not self.tabText(idx):
-            self.setTabText(idx, url)
+            self.setTabText(idx, url.replace('&', '&&'))
 
     @pyqtSlot(WebView)
     def on_icon_changed(self, tab):