diff --git a/src/ui/chat/tree.rs b/src/ui/chat/tree.rs
index 843e3f5..6b694e8 100644
--- a/src/ui/chat/tree.rs
+++ b/src/ui/chat/tree.rs
@@ -68,6 +68,7 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
     ) -> Reaction<M> {
         let harmless_char = (event.modifiers - KeyModifiers::SHIFT).is_empty();
 
+        // TODO Tab-completion
         match event.code {
             KeyCode::Esc => {
                 self.cursor = coming_from.map(Cursor::Msg).unwrap_or(Cursor::Bottom);
diff --git a/src/ui/widgets/editor.rs b/src/ui/widgets/editor.rs
index 0123beb..7221f6e 100644
--- a/src/ui/widgets/editor.rs
+++ b/src/ui/widgets/editor.rs
@@ -199,6 +199,9 @@ impl EditorState {
             guard.set_text(text);
         }
     }
+
+    // TODO Share key binding code
+    // TODO Support more of the emacs-y bindings, see bash as example
 }
 
 ////////////