diff --git a/TODO b/TODO
index c6f30a2a2..224a1f6ad 100644
--- a/TODO
+++ b/TODO
@@ -76,6 +76,10 @@ Improvements / minor features
 - Use QNetworkAccessManager per QWebPage again so we can set proxy per tab.
 - Multi-line statusbar or own widget for long messages?
 - :messages command to view past messages
+- Maybe the completion widget shouldn't be a QTreeView with tree models as
+  there are many hacks involved by now.
+  Perhaps using a QHBoxLayout of QTableViews and creating/destroying them based
+  on the completion would be a better idea?
 
 hints
 -----