diff --git a/tui.py b/tui.py
index f90d642..56e87d1 100644
--- a/tui.py
+++ b/tui.py
@@ -544,8 +544,12 @@ class NametagScreen(Screen):
         else:
             self.is_typing = False
             if button == 'b' or c == KEY_ESCAPE: self.state.current_screen = 'home'
-            elif button == 'm': self.nametag_member = '_'
-            elif button == 'g': self.nametag_guest = '_'
+            elif button == 'm':
+                self.nametag_member = '_'
+                self.is_typing = True
+            elif button == 'g':
+                self.nametag_guest = '_'
+                self.is_typing = True
             else: self.try_highlight(c)
 
     def is_entry_key(self, c):
@@ -635,11 +639,21 @@ class LabelScreen(Screen):
 
         if self.sub_screen == 'menu':
             if button == 'b' or c == KEY_ESCAPE: self.state.current_screen = 'home'
-            elif button == 't': self.sub_screen = 'tool'; self.label_tool = '_'
-            elif button == 's': self.sub_screen = 'material_name'; self.label_material_name = '_'
-            elif button == 'g': self.sub_screen = 'generic'; self.label_generic = '_'
-            elif button == 'c': self.sub_screen = 'consumable'; self.label_consumable = '_'
-            elif button == 'f': self.sub_screen = 'forum_search'; self.label_forum_search = '_'
+            elif button == 't':
+                self.sub_screen = 'tool'; self.label_tool = '_'
+                self.is_typing = True
+            elif button == 's':
+                self.sub_screen = 'material_name'; self.label_material_name = '_'
+                self.is_typing = True
+            elif button == 'g':
+                self.sub_screen = 'generic'; self.label_generic = '_'
+                self.is_typing = True
+            elif button == 'c':
+                self.sub_screen = 'consumable'; self.label_consumable = '_'
+                self.is_typing = True
+            elif button == 'f':
+                self.sub_screen = 'forum_search'; self.label_forum_search = '_'
+                self.is_typing = True
             else: self.try_highlight(c)
         elif self.sub_screen == 'tool':
             if c == KEY_ESCAPE: self.on_enter()