diff --git a/Changelog b/Changelog
index cae8f5f..e7e3639 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,8 @@
 [Changes 1.2c01 ]
 
+* Changed the defaults for JOIN_NEW_WINDOW_TYPE and QUERY_NEW_WINDOW_TYPE
+  so that they work out of the box. (caf)
+
 * Some cleanups in quit message handling, fixed a bug where a quit from an
   unexpected source could crash the client. (caf)
 
diff --git a/include/config.h b/include/config.h
index 0864393..b1a1e19 100644
--- a/include/config.h
+++ b/include/config.h
@@ -607,8 +607,8 @@
 #define DEFAULT_JOIN_NEW_WINDOW_TYPE "create hide swap last double on split on"
 #define DEFAULT_QUERY_NEW_WINDOW_TYPE "create hide swap last double on split on"
 #else
-#define DEFAULT_JOIN_NEW_WINDOW_TYPE "new hide_others swap last double on split on"
-#define DEFAULT_QUERY_NEW_WINDOW_TYPE "new hide_others swap last double on split on"
+#define DEFAULT_JOIN_NEW_WINDOW_TYPE "new hide_others double on"
+#define DEFAULT_QUERY_NEW_WINDOW_TYPE "new hide_others double on"
 #endif
 
 #define DEFAULT_MDI OFF