diff --git a/upptst/MaximizeOverlapped/MaximizeOverlapped.upp b/upptst/MaximizeOverlapped/MaximizeOverlapped.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/upptst/MaximizeOverlapped/MaximizeOverlapped.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/upptst/MaximizeOverlapped/main.cpp b/upptst/MaximizeOverlapped/main.cpp
new file mode 100644
index 000000000..ef54e1b1f
--- /dev/null
+++ b/upptst/MaximizeOverlapped/main.cpp
@@ -0,0 +1,20 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	TopWindow w;
+	w.Sizeable().Zoomable();
+	w.Title("Maximize me and close me - it should be possible to 'unmaximize' this window after it reopens");
+
+	TopWindow main;
+	main.Open();
+	for(;;) {
+		if(!w.IsOpen())
+			w.OpenMain();
+		if(!main.IsOpen())
+			break;
+		Ctrl::ProcessEvents();
+	}
+}