diff --git a/mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp b/mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
index f43c2a1ff8f..c72e3252b21 100644
--- a/mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
@@ -185,6 +185,9 @@ nsresult nsPluginNativeWindowGtk2::CreateXEmbedWindow() {
   g_signal_connect(mSocketWidget, "plug_removed",
                    G_CALLBACK(plug_removed_cb), NULL);
 
+  g_signal_connect(mGtkSocket, "destroy",
+                   GTK_SIGNAL_FUNC(gtk_widget_destroyed), &mGtkSocket);
+
   gpointer user_data = NULL;
   gdk_window_get_user_data(parent_win, &user_data);