diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 0885668e42..38ac3c14f4 100644
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -73,44 +73,12 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED
 }
 }
 
-//-----------------------------------------------------------------------------
-// "realize" from m_widget
-//-----------------------------------------------------------------------------
-
-/* we cannot MWM hints and icons before the widget has been realized,
-   so we do this directly after realization */
-
-extern "C" {
-static gint
-gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
-{
-    /* all this is for Motif Window Manager "hints" and is supposed to be
-       recognized by other WM as well. not tested. */
-    long decor = (long) GDK_DECOR_BORDER;
-    long func = (long) GDK_FUNC_MOVE ;
-
-    gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor);
-    gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
-
-    gtk_window_set_resizable(GTK_WINDOW(win->m_widget), FALSE);
-
-    return FALSE;
-}
-}
-
 void wxPopupWindow::AddChildGTK(wxWindowGTK* child)
 {
     gtk_widget_set_size_request(
         child->m_widget, child->m_width, child->m_height);
     gtk_fixed_put(
         GTK_FIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y);
-
-    if (HasFlag(wxTAB_TRAVERSAL))
-    {
-        /* we now allow a window to get the focus as long as it
-           doesn't have any children. */
-        GTK_WIDGET_UNSET_FLAGS(m_wxwindow, GTK_CAN_FOCUS);
-    }
 }
 
 //-----------------------------------------------------------------------------
@@ -143,19 +111,25 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     m_windowStyle |= wxTAB_TRAVERSAL;
 
     m_widget = gtk_window_new( GTK_WINDOW_POPUP );
-    g_object_ref(m_widget);
+    g_object_ref( m_widget );
 
-    if ((m_parent) && (GTK_IS_WINDOW(m_parent->m_widget)))
-        gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
+    gtk_widget_set_name( m_widget, "wxPopupWindow" );
+    gtk_window_set_type_hint( GTK_WINDOW(m_widget), GDK_WINDOW_TYPE_HINT_COMBO );
 
-    GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
+    GtkWidget *toplevel = gtk_widget_get_toplevel( parent->m_widget );
+    if (GTK_IS_WINDOW (toplevel))
+    {
+        gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (m_widget));
+        gtk_window_set_transient_for (GTK_WINDOW (m_widget), GTK_WINDOW (toplevel));
+    }
+    gtk_window_set_resizable (GTK_WINDOW (m_widget), FALSE);
+    gtk_window_set_screen (GTK_WINDOW (m_widget), gtk_widget_get_screen (GTK_WIDGET (parent->m_widget)));
 
     g_signal_connect (m_widget, "delete_event",
                       G_CALLBACK (gtk_dialog_delete_callback), this);
 
     m_wxwindow = wxPizza::New(m_windowStyle);
     gtk_widget_show( m_wxwindow );
-    GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
 
     gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
 
@@ -163,11 +137,6 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
 
     PostCreation();
 
-    /*  we cannot set MWM hints  before the widget has
-        been realized, so we do this directly after realization */
-    g_signal_connect (m_widget, "realize",
-                      G_CALLBACK (gtk_dialog_realized_callback), this);
-
     m_time = gtk_get_current_event_time();
 
     g_signal_connect (m_widget, "button_press_event",
@@ -221,6 +190,25 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag
     }
 }
 
+void wxPopupWindow::SetFocus()
+{
+    // set the focus to the first child who wants it
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindow *child = node->GetData();
+        node = node->GetNext();
+
+        if ( child->CanAcceptFocus() && !child->IsTopLevel() )
+        {
+            child->SetFocus();
+            return;
+        }
+    }
+    
+    wxPopupWindowBase::SetFocus();
+}
+
 bool wxPopupWindow::Show( bool show )
 {
     if (show && !IsShown())
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index d795867315..08583058e3 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -811,7 +811,7 @@ struct wxGtkIMData
 
 extern "C" {
 static gboolean
-gtk_window_key_press_callback( GtkWidget *widget,
+gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
                                GdkEventKey *gdk_event,
                                wxWindow *win )
 {
@@ -820,12 +820,6 @@ gtk_window_key_press_callback( GtkWidget *widget,
     if (g_blockEventsOnDrag)
         return FALSE;
 
-    // GTK+ sends keypress events to the focus widget and then
-    // to all its parent and grandparent widget. We only want
-    // the key events from the focus widget.
-    if (!GTK_WIDGET_HAS_FOCUS(widget))
-        return FALSE;
-
     wxKeyEvent event( wxEVT_KEY_DOWN );
     bool ret = false;
     bool return_after_IM = false;