Index: source/blender/windowmanager/intern/wm_files.c
===================================================================
--- source/blender/windowmanager/intern/wm_files.c	(revision 20082)
+++ source/blender/windowmanager/intern/wm_files.c	(working copy)
@@ -211,6 +211,8 @@
 						win->sizey= oldwin->sizey;
 						win->posx= oldwin->posx;
 						win->posy= oldwin->posy;
+						win->windowstate = oldwin->windowstate;
+						GHOST_SetWindowState(win->ghostwin, win->windowstate);
 					}
 				}
 			}
Index: source/blender/windowmanager/intern/wm_window.c
===================================================================
--- source/blender/windowmanager/intern/wm_window.c	(revision 20082)
+++ source/blender/windowmanager/intern/wm_window.c	(working copy)
@@ -220,7 +220,8 @@
 	
 	//		inital_state = GHOST_kWindowStateFullScreen;
 	//		inital_state = GHOST_kWindowStateMaximized;
-	inital_state = GHOST_kWindowStateNormal;
+	//		inital_state = GHOST_kWindowStateNormal;
+	inital_state = win->windowstate;
 	
 #ifdef __APPLE__
 	{
@@ -289,7 +290,7 @@
 				win->posy= prefstay;
 				win->sizex= prefsizx;
 				win->sizey= prefsizy;
-				win->windowstate= 0;
+				win->windowstate= GHOST_kWindowStateNormal;
 			}
 			wm_window_add_ghostwindow(wm, "Blender", win);
 		}
@@ -498,7 +499,12 @@
 					win->sizey= b-t;
 					win->posx= l;
 					win->posy= scr_h - t - win->sizey;
-
+					
+					if(state==GHOST_kWindowStateMaximized)
+						win->windowstate = GHOST_kWindowStateMaximized;
+					else if(state==GHOST_kWindowStateNormal)
+						win->windowstate = GHOST_kWindowStateNormal;
+					
 					/* debug prints */
 					if(0) {
 						state = GHOST_GetWindowState(win->ghostwin);