diff --git a/main/src/ui/chat_input/view.vala b/main/src/ui/chat_input/view.vala
index b99cd1c4..fe0767cb 100644
--- a/main/src/ui/chat_input/view.vala
+++ b/main/src/ui/chat_input/view.vala
@@ -74,7 +74,7 @@ public class View : Box {
             chat_text_view.text_view.buffer.text = entry_cache[conversation];
         }
 
-        chat_text_view.text_view.grab_focus();
+        do_focus();
     }
 
     public void set_input_state(Plugins.InputFieldStatus.MessageType message_type) {
@@ -105,6 +105,10 @@ public class View : Box {
             return false;
         });
     }
+
+    public void do_focus() {
+        chat_text_view.text_view.grab_focus();
+    }
 }
 
 }
diff --git a/main/src/ui/conversation_view.vala b/main/src/ui/conversation_view.vala
index 5d27e138..92c4fbb3 100644
--- a/main/src/ui/conversation_view.vala
+++ b/main/src/ui/conversation_view.vala
@@ -31,6 +31,7 @@ public class ConversationView : Gtk.Overlay {
         widget.destroy.connect(() => {
             revealer.destroy();
             white_revealer.reveal_child = false;
+            chat_input.do_focus();
         });
     }