diff --git a/ChangeLog b/ChangeLog
index 4b51a58e1d33cefac49d87ed991226ad7eb01c0f..822441b150b55e3983f233156f677da75f3190b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -229,6 +229,8 @@ Changes
 	  Also fix minor problem with search history where the current
 	  search item could be at the bottom of the history twice in a
 	  row under certain conditions. (DLR)
+	- Move down NANO_SMALL in tab check so nano won't complain if
+	  just NANO_SMALL is defined (David Benbennick, presumed fix).
   edit_refresh()
 	- Miscellaneous cleanups that fix a bug where the screen
 	  isn't updated after uncutting chunks of upwardly marked cut
diff --git a/winio.c b/winio.c
index 31f7fee3a52600bfd08fefd1bbcb70e23b5c7833..6aa687b9b476026e014e95f87212ccd640d5a6bd 100644
--- a/winio.c
+++ b/winio.c
@@ -336,7 +336,6 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
 #ifndef DISABLE_TABCOMP
 	    else {
 #endif
-#endif
 #ifndef DISABLE_TABCOMP
 		if (allowtabs) {
 		    int shift = 0;
@@ -349,6 +348,7 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
 		}
 	    }
 #endif
+#endif /* NANO_SMALL */
 	    break;
 	case KEY_LEFT:
 	case NANO_BACK_KEY: