diff --git a/ChangeLog b/ChangeLog
index 07d6b170474391185ec04b16efc5d118970769d5..a248884c763312314352cfacaf3a56b32b40e27d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 	* src/files.c (has_valid_path): Be more specific in how a given path
 	is invalid.  The change was improved by Rishabh Dave.
 	* doc/syntax/nanorc.nanorc: Show ^^ and M-^ as valid key names.
+	* src/prompt.c (do_statusbar_home): Make Home go always fully home.
 
 2016-01-29  Benno Schulenberg  <bensberg@justemail.net>
 	* src/files.c (do_insertfile): Do display the buffer when configured
diff --git a/src/prompt.c b/src/prompt.c
index 5a2e7b986ea2c0524faafe9bafc80e211d980ae8..cfcf5cb21c3ccdb35134da7d4e29c107eabe722b 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -319,25 +319,10 @@ void do_statusbar_output(char *output, size_t output_len, bool
     update_statusbar_line(answer, statusbar_x);
 }
 
-/* Move to the beginning of the prompt text.  If the SMART_HOME flag is
- * set, move to the first non-whitespace character of the prompt text if
- * we're not already there, or to the beginning of the prompt text if we
- * are. */
+/* Move to the beginning of the prompt text. */
 void do_statusbar_home(void)
 {
-#ifndef NANO_TINY
-    if (ISSET(SMART_HOME)) {
-	size_t statusbar_x_save = statusbar_x;
-
-	statusbar_x = indent_length(answer);
-
-	if (statusbar_x == statusbar_x_save ||
-		statusbar_x == strlen(answer))
-	    statusbar_x = 0;
-    } else
-#endif
-	statusbar_x = 0;
-
+    statusbar_x = 0;
     update_the_bar();
 }