diff --git a/src/proto.h b/src/proto.h
index 0e2e5641dd6682b4e0021936d4dda7f0ac9ab244..a2d523d8a5c548d2542077e602cee62e03da9119 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -609,6 +609,8 @@ void remove_magicline(void);
 #ifndef NANO_TINY
 void mark_order(const filestruct **top, size_t *top_x, const filestruct
 	**bot, size_t *bot_x, bool *right_side_up);
+void get_region(const filestruct **top, size_t *top_x,
+        const filestruct **bot, size_t *bot_x);
 #endif
 size_t get_totsize(const filestruct *begin, const filestruct *end);
 #ifndef NANO_TINY
diff --git a/src/text.c b/src/text.c
index 84e432e0b9e7e80e70ffbd81224f59d09c251e4f..3da83ccd2b5b4718f754ed2e7fc00319b4ee702a 100644
--- a/src/text.c
+++ b/src/text.c
@@ -300,8 +300,8 @@ void do_indent(void)
 
     /* Use either all the marked lines or just the current line. */
     if (openfile->mark)
-	mark_order((const filestruct **)&top, &top_x,
-			(const filestruct **)&bot, &bot_x, NULL);
+	get_region((const filestruct **)&top, &top_x,
+			(const filestruct **)&bot, &bot_x);
     else {
 	top = openfile->current;
 	bot = top;
@@ -405,8 +405,8 @@ void do_unindent(void)
 
     /* Use either all the marked lines or just the current line. */
     if (openfile->mark)
-	mark_order((const filestruct **)&top, &top_x,
-			(const filestruct **)&bot, &bot_x, NULL);
+	get_region((const filestruct **)&top, &top_x,
+			(const filestruct **)&bot, &bot_x);
     else {
 	top = openfile->current;
 	bot = top;
@@ -509,8 +509,8 @@ void do_comment(void)
 
     /* Determine which lines to work on. */
     if (openfile->mark)
-	mark_order((const filestruct **)&top, &top_x,
-			(const filestruct **)&bot, &bot_x, NULL);
+	get_region((const filestruct **)&top, &top_x,
+			(const filestruct **)&bot, &bot_x);
     else {
 	top = openfile->current;
 	bot = top;
diff --git a/src/utils.c b/src/utils.c
index d16c5e8af46cdee84620ad5d12026323cf071dd7..a926f24852e33506e92b12cd10e4860c300e2350 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -532,6 +532,17 @@ void mark_order(const filestruct **top, size_t *top_x, const filestruct
     }
 }
 
+/* Get the start and end points of the marked region, but
+ * push the end point back if it's at the start of a line. */
+void get_region(const filestruct **top, size_t *top_x,
+	const filestruct **bot, size_t *bot_x)
+{
+    mark_order(top, top_x, bot, bot_x, NULL);
+
+    if (*bot_x == 0)
+	*bot = (*bot)->prev;
+}
+
 /* Given a line number, return a pointer to the corresponding struct. */
 filestruct *fsfromline(ssize_t lineno)
 {