--- old/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c	2015-07-13 17:38:44.256817900 +0300
+++ new/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c	2015-07-13 17:38:43.729712500 +0300
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <jni_util.h>
 #include <string.h>
+#include <X11/X.h>
 #include "gtk2_interface.h"
 #include "sun_awt_X11_GtkFileDialogPeer.h"
 #include "java_awt_FileDialog.h"
@@ -38,6 +39,7 @@
 static jmethodID filenameFilterCallbackMethodID = NULL;
 static jmethodID setFileInternalMethodID = NULL;
 static jfieldID  widgetFieldID = NULL;
+static jmethodID  setWindowMethodID = NULL;
 
 JNIEXPORT void JNICALL Java_sun_awt_X11_GtkFileDialogPeer_initIDs
 (JNIEnv *env, jclass cx)
@@ -54,6 +56,10 @@
 
     widgetFieldID = (*env)->GetFieldID(env, cx, "widget", "J");
     DASSERT(widgetFieldID != NULL);
+
+    setWindowMethodID = (*env)->GetMethodID(env, cx, "setWindow", "(J)Z");
+    DASSERT(setWindowMethodID != NULL);
+    CHECK_NULL(setWindowMethodID);
 }
 
 static gboolean filenameFilterCallback(const GtkFileFilterInfo * filter_info, gpointer obj)
@@ -401,7 +407,11 @@
 
     fp_gtk_widget_show(dialog);
 
-    fp_gtk_main();
+    XID xid = fp_gdk_x11_drawable_get_xid(dialog->window);
+    if( (*env)->CallBooleanMethod(env, jpeer, setWindowMethodID, xid) ) {
+        fp_gtk_main();
+    }
+
     fp_gdk_threads_leave();
 }