diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 1eb9405e..657c42fa 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -881,6 +881,8 @@ class Tag {
 			$tag_array = array("tagme");
 		}
 
+		sort($tag_array);
+
 		return $tag_array;
 	}
 
@@ -891,6 +893,7 @@ class Tag {
 			// do nothing
 		}
 		else if(is_array($tags)) {
+			sort($tags);
 			$tags = implode(' ', $tags);
 		}