diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 551213fd5c55420f13d29ad2497c06e7c4835f48..ad7b111fb41368f677d1c484ad8225293697db09 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -291,7 +291,6 @@ struct _GtkTextPrivate
   guint         propagate_text_width    : 1;
   guint         text_handles_enabled    : 1;
   guint         enable_undo             : 1;
-  guint         emoji_chooser_open      : 1;
 };
 
 struct _GtkTextPasswordHint
@@ -3460,7 +3459,7 @@ gtk_text_grab_focus (GtkWidget *widget)
   if (!GTK_WIDGET_CLASS (gtk_text_parent_class)->grab_focus (GTK_WIDGET (self)))
     return FALSE;
 
-  if (priv->editable && !priv->in_click && !prev_focus_was_child && !priv->emoji_chooser_open)
+  if (priv->editable && !priv->in_click && !prev_focus_was_child)
     {
       g_object_get (gtk_widget_get_settings (widget),
                     "gtk-entry-select-on-focus",
@@ -7184,15 +7183,6 @@ gtk_text_get_tabs (GtkText *self)
   return priv->tabs;
 }
 
-static void
-emoji_chooser_closed (GtkWidget *chooser,
-                      GtkText   *text)
-{
-  GtkTextPrivate *priv = gtk_text_get_instance_private (text);
-
-  priv->emoji_chooser_open = 1;
-}
-
 static void
 emoji_picked (GtkEmojiChooser *chooser,
               const char      *text,
@@ -7218,7 +7208,6 @@ emoji_picked (GtkEmojiChooser *chooser,
 static void
 gtk_text_insert_emoji (GtkText *self)
 {
-  GtkTextPrivate *priv = gtk_text_get_instance_private (self);
   GtkWidget *chooser;
 
   if (gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_EMOJI_CHOOSER) != NULL)
@@ -7232,11 +7221,9 @@ gtk_text_insert_emoji (GtkText *self)
 
       gtk_widget_set_parent (chooser, GTK_WIDGET (self));
       g_signal_connect (chooser, "emoji-picked", G_CALLBACK (emoji_picked), self);
-      g_signal_connect_swapped (chooser, "hide", G_CALLBACK (emoji_chooser_closed), self);
     }
 
   gtk_popover_popup (GTK_POPOVER (chooser));
-  priv->emoji_chooser_open = 1;
 }
 
 static void
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 923ea9eef00273b44682c6b2dac90740ff8a36b7..a8042ff42322deae741b9e3b72ea1a54b3577c8e 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -10399,7 +10399,6 @@ gtk_text_view_insert_emoji (GtkTextView *text_view)
 
       gtk_widget_set_parent (chooser, GTK_WIDGET (text_view));
       g_signal_connect (chooser, "emoji-picked", G_CALLBACK (emoji_picked), text_view);
-      g_signal_connect_swapped (chooser, "hide", G_CALLBACK (gtk_widget_grab_focus), text_view);
     }
 
   buffer = get_buffer (text_view);