diff --git a/Classes/WPEditorViewController.m b/Classes/WPEditorViewController.m
index 80f1bb8..934451e 100644
--- a/Classes/WPEditorViewController.m
+++ b/Classes/WPEditorViewController.m
@@ -152,8 +152,6 @@ - (void)viewWillAppear:(BOOL)animated
     [super viewWillAppear:animated];
 	
     if (!self.isFirstSetupComplete) {
-        self.isFirstSetupComplete = YES;
-
         // When restoring state, the navigationController is nil when the view loads,
         // so configure its appearance here instead.
         self.navigationController.navigationBar.translucent = NO;
@@ -174,6 +172,11 @@ - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     if (self.isFirstSetupComplete) {
         [self restoreEditSelection];
+    } else {
+        // Note: Very important this is set here otherwise the post will not initially
+        // load properly in the editor. Please be careful if you make a change here and
+        // test the editor within WPiOS!
+        self.isFirstSetupComplete = YES;
     }
 }