diff --git a/ChangeLog b/ChangeLog
index 0859bff45b72272efcb13afc9ddfaba56a8f090e..c24b87e9c4f55346c0c65dc06e6ca85b257346f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Current CVS:
+- nano.c:
+  main():
+	- TABSIZE now set before first call to edit_refresh (Bill Soudan)
+
 nano-0.9.12 - 07/07/2000
 - all:
 	- New regexp search feature by Bill Soudan.  New flags USE_REGEXP
diff --git a/nano.c b/nano.c
index 4a2bbe09866084f175338e8f37791c2ffe5b9f48..1d401b25423edb47e28d57155fb3f73bffa87b77 100644
--- a/nano.c
+++ b/nano.c
@@ -1757,14 +1757,14 @@ int main(int argc, char *argv[])
     else
 	edit_update(fileage);
 
-    edit_refresh();
-    reset_cursor();
-
 #ifdef HAVE_TABSIZE
     if (usrtabsize > 0)
 	TABSIZE = usrtabsize;
 #endif
 
+    edit_refresh();
+    reset_cursor();
+
     while (1) {
 	kbinput = wgetch(edit);
 	if (kbinput == 27) {	/* Grab Alt-key stuff first */