diff --git a/ChangeLog b/ChangeLog
index f0059c7..e2a7240 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -90,13 +90,13 @@
 	  wint_t type. (DLR, found by Emily Jackson)
 	- Add the ability to convert typed tabs to spaces using
 	  the -E/--tabstospaces command line options, the "tabstospaces"
-	  rcfile option, and the toggle Meta-E.  Note that this doesn't
-	  affect tabs entered using verbatim input, and that it's
-	  disabled when NANO_SMALL is defined.  Also, change the short
-	  command line option for --backupdir from -E to -C.  Changes to
-	  toggle_init(), usage(), do_tab(), main(), nanorc.sample,
-	  nano.1, nanorc.5, and nano.texi. (DLR, suggested by many
-	  people)
+	  rcfile option, and the toggle Meta-Q (since QBasic did this by
+	  default :)).  Note that this doesn't affect tabs entered using
+	  verbatim input, and that it's disabled when NANO_SMALL is
+	  defined.  Also, change the short command line option for
+	  --backupdir from -E to -C.  Changes to toggle_init(), usage(),
+	  do_tab(), main(), nanorc.sample, nano.1, nanorc.5, and
+	  nano.texi. (DLR, suggested by many people)
 	- Change the CONSTUPDATE, REVERSE_SEARCH, and SMOOTHSCROLL flags
 	  to the CONST_UPDATE, BACKWARDS_SEARCH, and SMOOTH_SCROLL
 	  flags, respectively. (DLR)
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 8681a9a..f9bfc8f 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -352,9 +352,6 @@
 @item Constant Cursor Position Display Toggle (Meta-C)
 toggles the -c (@code{--const}) command line flag.
 
-@item Tabs to Spaces Toggle (Meta-E)
-toggles the -E (@code{--tabstospaces}) command line flag.
-
 @item Multiple File Buffers Toggle (Meta-F)
 toggles the -F (@code{--multibuffer}) command line flag.
 
@@ -383,6 +380,9 @@
 toggles whitespace display mode if you have a "whitespace" option in
 your .nanorc.
 
+@item Tabs to Spaces Toggle (Meta-Q)
+toggles the -E (@code{--tabstospaces}) command line flag.
+
 @item Smooth Scrolling Toggle (Meta-S)
 toggles the -S (@code{--smooth}) command line flag.
 
diff --git a/src/nano.h b/src/nano.h
index 49219f9..440d5d4 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -490,7 +490,7 @@
 #define TOGGLE_SMARTHOME_KEY	NANO_ALT_H
 #define TOGGLE_WHITESPACE_KEY	NANO_ALT_P
 #define TOGGLE_MORESPACE_KEY	NANO_ALT_O
-#define TOGGLE_TABSTOSPACES_KEY	NANO_ALT_E
+#define TOGGLE_TABSTOSPACES_KEY	NANO_ALT_Q
 #endif /* !NANO_SMALL */
 
 #define MAIN_VISIBLE 12