diff --git a/src/Controllers/TagController.php b/src/Controllers/TagController.php
index 1b95fe34..737f64b6 100644
--- a/src/Controllers/TagController.php
+++ b/src/Controllers/TagController.php
@@ -103,13 +103,19 @@ class TagController
 		PrivilegesHelper::confirmWithException(Privilege::MassTag);
 		if (InputHelper::get('submit'))
 		{
+			$suppliedOldPage = intval(InputHelper::get('old-page'));
+			$suppliedOldQuery = InputHelper::get('old-query');
 			$suppliedQuery = InputHelper::get('query');
-			if (!$suppliedQuery)
-				$suppliedQuery = ' ';
 			$suppliedTag = InputHelper::get('tag');
-			if (!empty($suppliedTag))
-				$suppliedTag = TagModel::validateTag($suppliedTag);
-			\Chibi\UrlHelper::forward(\Chibi\UrlHelper::route('post', 'list', ['source' => 'mass-tag', 'query' => $suppliedQuery, 'additionalInfo' => $suppliedTag]));
+
+			$params = [
+				'source' => 'mass-tag',
+				'query' => $suppliedQuery ?: ' ',
+				'additionalInfo' => $suppliedTag ? TagModel::validateTag($suppliedTag) : '',
+			];
+			if ($suppliedOldPage != 0 and $suppliedOldQuery == $suppliedQuery)
+				$params['page'] = $suppliedOldPage;
+			\Chibi\UrlHelper::forward(\Chibi\UrlHelper::route('post', 'list', $params));
 		}
 	}
 }
diff --git a/src/Views/tag-mass-tag.phtml b/src/Views/tag-mass-tag.phtml
index 70853c89..ee715a48 100644
--- a/src/Views/tag-mass-tag.phtml
+++ b/src/Views/tag-mass-tag.phtml
@@ -12,6 +12,8 @@
 			<div class="input-wrapper"><input class="autocomplete" type="text" name="tag" id="mass-tag-tag" value="<?php echo isset($this->context->massTagTag) ? htmlspecialchars($this->context->massTagTag) : '' ?>"/></div>
 		</div>
 
+		<input type="hidden" name="old-page" value="<?php echo isset($this->context->transport->paginator) ? htmlspecialchars($this->context->transport->paginator->page) : '' ?>"/>
+		<input type="hidden" name="old-query" value="<?php echo isset($this->context->massTagQuery) ? htmlspecialchars($this->context->massTagQuery) : '' ?>"/>
 		<input type="hidden" name="submit" value="1"/>
 
 		<div class="form-row">