diff --git a/TODO.md b/TODO.md
index f0acb7ae..5d28bd71 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,6 +1,5 @@
 # TODO
 
-- text area tab handling
 - fix cursor over field
 - update room highlight when creating new room
 - keyerror when forgetting room while loading members
diff --git a/src/gui/Pages/AddChat/CreateRoom.qml b/src/gui/Pages/AddChat/CreateRoom.qml
index 21d3519d..dccadc60 100644
--- a/src/gui/Pages/AddChat/CreateRoom.qml
+++ b/src/gui/Pages/AddChat/CreateRoom.qml
@@ -94,6 +94,7 @@ HBox {
         HTextArea {
             width: parent.width
             placeholderText: qsTr("This room is about...")
+            focusItemOnTab: publicCheckBox
         }
     }
 
diff --git a/src/gui/Pages/Chat/RoomPane/SettingsView.qml b/src/gui/Pages/Chat/RoomPane/SettingsView.qml
index fa3e2609..4b87bea1 100644
--- a/src/gui/Pages/Chat/RoomPane/SettingsView.qml
+++ b/src/gui/Pages/Chat/RoomPane/SettingsView.qml
@@ -112,6 +112,11 @@ HBox {
             placeholderText: qsTr("This room is about...")
             defaultText: chat.roomInfo.plain_topic
             enabled: chat.roomInfo.can_set_topic
+
+            focusItemOnTab:
+                encryptCheckBox.checked ?
+                requireInviteCheckbox :
+                encryptCheckBox
         }
     }