diff -r 763e71cb2ad7 -r d0af5235a720 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Tue Jul 09 22:35:02 2019 -0500
+++ b/pidgin/gtkconv.c	Tue Jul 09 23:02:47 2019 -0500
@@ -5370,8 +5370,6 @@
 		gtkconv
 	);
 
-	frame = pidgin_create_webview(TRUE, &gtkconv->entry, NULL);
-
 	if (!chat) {
 		/* For sending typing notifications for IMs */
 		gtkconv->u.im->typing_timer = 0;
@@ -5723,8 +5721,6 @@
 	}
 
 	pidgin_webview_switch_active_conversation(
-		PIDGIN_WEBVIEW(gtkconv->entry), conv);
-	pidgin_webview_switch_active_conversation(
 		PIDGIN_WEBVIEW(gtkconv->webview), conv);
 
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons"))
@@ -9246,7 +9242,7 @@
 		}
 	}
 
-	gtk_widget_grab_focus(active_gtkconv->entry);
+	gtk_widget_grab_focus(active_gtkconv->editor);
 
 	return TRUE;
 }
@@ -9449,7 +9445,7 @@
 	g_signal_handlers_disconnect_matched(G_OBJECT(entry), G_SIGNAL_MATCH_DATA,
 				0, 0, NULL, NULL, gtkconv);
 	gtk_widget_show(gtkconv->infopane);
-	gtk_widget_grab_focus(gtkconv->entry);
+	gtk_widget_grab_focus(gtkconv->editor);
 	gtk_widget_destroy(entry);
 }
 
@@ -10073,7 +10069,7 @@
 
 	focus_gtkconv = g_list_nth_data(pidgin_conv_window_get_gtkconvs(win),
 	                             gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook)));
-	gtk_widget_grab_focus(focus_gtkconv->entry);
+	gtk_widget_grab_focus(focus_gtkconv->editor);
 
 	if (pidgin_conv_window_get_gtkconv_count(win) == 1)
 		update_send_to_selection(win);