diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index fe1b19aa0..6701779ca 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -26,6 +26,8 @@ Changed
 
 - The desktop file `qutebrowser.desktop` is now renamed to
   `org.qutebrowser.qutebrowser.desktop`.
+- Pinned tabs now always show a favicon (even if the site doesn't provide one)
+  when shrinking.
 
 Fixed
 ~~~~~
diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index 4fe041f55..0df47bf76 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -356,7 +356,7 @@ class TabWidget(QTabWidget):
                 self.window().setWindowIcon(self.window().windowIcon())
 
     def setTabIcon(self, idx: int, icon: QIcon):
-        """Add overrides for setting tab icon sometimes when it is empty."""
+        """Always show tab icons for pinned tabs in some circumstances."""
         tab = self.widget(idx)
         if (icon.isNull() and
                 config.cache['tabs.favicons.show'] != 'never' and