diff --git a/controllers/EditTag.php b/controllers/EditTag.php
index 12de0928..fcb0e966 100644
--- a/controllers/EditTag.php
+++ b/controllers/EditTag.php
@@ -182,8 +182,11 @@ class EditTag extends HTMLController
 				$tag->save();
 			}
 
-			// Redirect to the tag management page.
-			header('Location: ' . BASEURL . '/managetags/');
+			// Redirect to a clean page
+			if (Registry::get('user')->isAdmin())
+				header('Location: ' . BASEURL . '/managetags/');
+			else
+				header('Location: ' . BASEURL . '/edittag/?id=' . $id_tag);
 			exit;
 		}
 	}