diff --git a/src/files.c b/src/files.c
index 103be064..d8cb28eb 100644
--- a/src/files.c
+++ b/src/files.c
@@ -169,8 +169,8 @@ void open_buffer(const char *filename)
 
     /* If the filename isn't blank, open the file.  Otherwise, treat it
      * as a new file. */
-    rc = (filename[0] != '\0') ? open_file(filename, new_buffer, &f) :
-	-2;
+    rc = (filename[0] != '\0') ?
+	open_file(filename, new_buffer, &f) : -2;
 
     /* If we're loading into a new buffer, add a new openfile entry. */
     if (new_buffer)
diff --git a/src/nano.c b/src/nano.c
index 32708beb..fe823056 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -4699,9 +4699,6 @@ int main(int argc, char **argv)
 	UNSET(VIEW_MODE);
     }
 
-    /* Update the screen to account for the current buffer. */
-    load_buffer();
-
 #ifdef ENABLE_MULTIBUFFER
     if (!old_multibuffer)
 	UNSET(MULTIBUFFER);
@@ -4721,7 +4718,8 @@ int main(int argc, char **argv)
     sigsetjmp(jmpbuf, 1);
 #endif
 
-    edit_refresh();
+    /* Update the screen to account for the current buffer. */
+    load_buffer();
 
     while (TRUE) {
 	bool meta_key, func_key, s_or_t, ran_func, finished;