diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 95441e74771..d40ce4145f5 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -297,11 +297,13 @@ GHOST_WindowX11(
 	// we want this window treated.
 
 	XSizeHints * xsizehints = XAllocSizeHints();
-	xsizehints->flags = USPosition | USSize;
+	xsizehints->flags = USPosition | USSize | PMinSize;
 	xsizehints->x = left;
 	xsizehints->y = top;
 	xsizehints->width = width;
 	xsizehints->height = height;
+	xsizehints->min_width= 320;  	// size hints, could be made apart of the ghost api
+	xsizehints->min_height= 240;	// limits are also arbitrary, but should not allow 1x1 window
 	XSetWMNormalHints(m_display, m_window, xsizehints);
 	XFree(xsizehints);
 
@@ -382,7 +384,6 @@ GHOST_WindowX11(
 	XSetWMHints(display, m_window, xwmhints );
 	XFree(xwmhints);
 	// done setting the icon
-	
 
 	setTitle(title);