diff --git a/src/kevinbot_desktopclient/main.py b/src/kevinbot_desktopclient/main.py
index 0cbf1de..6b1fa4a 100644
--- a/src/kevinbot_desktopclient/main.py
+++ b/src/kevinbot_desktopclient/main.py
@@ -168,6 +168,7 @@ def run(self):
                 ConnectionRefusedError,
                 kevinbotlib.exceptions.HandshakeTimeoutException,
                 socket.gaierror,
+                TimeoutError,
             ) as e:
                 logger.error(f"Failed to connect to MQTT broker: {e!r}")
                 self.signals.connection_error.emit(e, traceback.format_exc())
diff --git a/src/kevinbot_desktopclient/ui/delegates.py b/src/kevinbot_desktopclient/ui/delegates.py
index 3df17fe..5e82bc5 100644
--- a/src/kevinbot_desktopclient/ui/delegates.py
+++ b/src/kevinbot_desktopclient/ui/delegates.py
@@ -2,7 +2,7 @@
 Useful delegates for Qt
 """
 
-from PySide6.QtCore import QModelIndex
+from PySide6.QtCore import QModelIndex, QPersistentModelIndex
 from PySide6.QtGui import QPainter
 from PySide6.QtWidgets import QApplication, QStyle, QStyledItemDelegate, QStyleOptionViewItem
 
@@ -16,7 +16,7 @@ class ComboBoxNoTextDelegate(QStyledItemDelegate):
     def __init__(self, parent=None):
         super().__init__(parent)
 
-    def paint(self, painter: QPainter, option: 'QStyleOptionViewItem', index: QModelIndex) -> None:
+    def paint(self, painter: QPainter, option: QStyleOptionViewItem, index: QModelIndex | QPersistentModelIndex) -> None:
         # Create a copy of the style option
         opt = option