diff --git a/source/creator/creator.c b/source/creator/creator.c
index 185c98c3f44..46c0376c02a 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -838,9 +838,11 @@ static int load_file(int argc, char **argv, void *data)
 		/*we successfully loaded a blend file, get sure that
 		pointcache works */
 		if (retval!=0) {
+			wmWindowManager *wm= CTX_wm_manager(C);
 			CTX_wm_manager_set(C, NULL); /* remove wm to force check */
 			WM_check(C);
 			G.relbase_valid = 1;
+			if (CTX_wm_manager(C) == NULL) CTX_wm_manager_set(C, wm); /* reset wm */
 		}
 
 		/* happens for the UI on file reading too (huh? (ton))*/