diff --git a/src/java/org/lwjgl/opengl/LinuxDisplay.java b/src/java/org/lwjgl/opengl/LinuxDisplay.java
index d81a30ba..a5685e9b 100644
--- a/src/java/org/lwjgl/opengl/LinuxDisplay.java
+++ b/src/java/org/lwjgl/opengl/LinuxDisplay.java
@@ -68,6 +68,9 @@ final class LinuxDisplay implements DisplayImplementation {
 	private final static int NotifyPointerRoot = 6;
 	private final static int NotifyDetailNone = 7;
 
+	private final static int SetModeInsert = 0;
+	private final static int SaveSetRoot = 1;
+	private final static int SaveSetUnmap = 1;
 
 	/** Window mode enum */
 	private static final int FULLSCREEN_LEGACY = 1;
@@ -382,13 +385,21 @@ final class LinuxDisplay implements DisplayImplementation {
 		try {
 			incDisplay();
 			try {
+				if (parent != null && !hasXFixes(getDisplay(), 1))
+					throw new LWJGLException("No XFixes extension available");
 				ByteBuffer handle = peer_info.lockAndGetHandle();
 				try {
 					current_window_mode = getWindowMode(fullscreen);
 					boolean undecorated = Display.getPrivilegedBoolean("org.lwjgl.opengl.Window.undecorated") || current_window_mode != WINDOWED;
 					this.parent = parent;
-					parent_window = parent != null ? getHandle(parent) : getRootWindow(getDisplay(), getDefaultScreen());
-					current_window = nCreateWindow(getDisplay(), getDefaultScreen(), handle, mode, current_window_mode, x, y, undecorated, parent_window);
+					long root_window = getRootWindow(getDisplay(), getDefaultScreen());
+					current_window = nCreateWindow(getDisplay(), getDefaultScreen(), handle, mode, current_window_mode, x, y, undecorated, root_window);
+					if (parent != null) {
+						parent_window = getHandle(parent);
+						changeSaveSet(getDisplay(), current_window, SetModeInsert, SaveSetRoot, SaveSetUnmap);
+						reparentWindow(getDisplay(), current_window, parent_window, x, y);
+					}
+					mapRaised(getDisplay(), current_window);
 					xembedded = parent != null && isAncestorXEmbedded(parent_window);
 					blank_cursor = createBlankCursor();
 					parent_focus_window_valid = false;
@@ -416,6 +427,10 @@ final class LinuxDisplay implements DisplayImplementation {
 	private static native long getRootWindow(long display, int screen);
 	private static native boolean hasProperty(long display, long window, long property);
 	private static native long getParentWindow(long display, long window) throws LWJGLException;
+	private static native void mapRaised(long display, long window);
+	private static native boolean hasXFixes(long display, int major);
+	private static native void reparentWindow(long display, long window, long parent, int x, int y);
+	private static native void changeSaveSet(long display, long window, int mode, int target, int map);
 
 	private boolean isAncestorXEmbedded(long window) throws LWJGLException {
 		long xembed_atom = internAtom("_XEMBED_INFO", true);
diff --git a/src/native/linux/org_lwjgl_opengl_Display.c b/src/native/linux/org_lwjgl_opengl_Display.c
index cac1deed..4b80cc49 100644
--- a/src/native/linux/org_lwjgl_opengl_Display.c
+++ b/src/native/linux/org_lwjgl_opengl_Display.c
@@ -43,6 +43,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/xf86vmode.h>
+#include <X11/extensions/Xfixes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -326,7 +327,6 @@ static Window createWindow(JNIEnv* env, Display *disp, int screen, jint window_m
 		XChangeProperty(disp, win, XInternAtom(disp, "_NET_WM_STATE", False),
 						XInternAtom(disp, "ATOM", False), 32, PropModeReplace, (const unsigned char*)&fullscreen_atom, 1);
 	}
-	XMapRaised(disp, win);
 	if (!checkXError(env, disp)) {
 		destroyWindow(env, disp, win);
 		return 0;
@@ -334,6 +334,36 @@ static Window createWindow(JNIEnv* env, Display *disp, int screen, jint window_m
 	return win;
 }
 
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_reparentWindow(JNIEnv *env, jclass unused, jlong display, jlong window_ptr, jlong parent_ptr, jint x, jint y) {
+	Display *disp = (Display *)(intptr_t)display;
+	Window window = (Window)window_ptr;
+	Window parent = (Window)parent_ptr;
+	XReparentWindow(disp, window, parent, x, y);
+}
+
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_LinuxDisplay_hasXFixes(JNIEnv *env, jclass unused, jlong display, jint major_requested) {
+	Display *disp = (Display *)(intptr_t)display;
+	int event, error;
+	if (!XFixesQueryExtension(disp, &event, &error))
+		return JNI_FALSE;
+	int major, minor;
+	if (!XFixesQueryVersion(disp, &major, &minor))
+		return JNI_FALSE;
+	return major >= major_requested ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_mapRaised(JNIEnv *env, jclass unused, jlong display, jlong window_ptr) {
+	Display *disp = (Display *)(intptr_t)display;
+	Window window = (Window)window_ptr;
+	XMapRaised(disp, window);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_changeSaveSet(JNIEnv *env, jclass unused, jlong display, jlong window_ptr, jint mode, jint target, jint map) {
+	Display *disp = (Display *)(intptr_t)display;
+	Window window = (Window)window_ptr;
+	XFixesChangeSaveSet(disp, window, mode, target, map);
+}
+
 JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_LinuxDisplay_getParentWindow(JNIEnv *env, jclass unused, jlong display, jlong window_ptr) {
 	Display *disp = (Display *)(intptr_t)display;
 	Window window = (Window)window_ptr;