diff --git a/core/database.class.php b/core/database.class.php
index 0173ee1c..7e5884f8 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -122,6 +122,11 @@ class Database {
 		if(count($tag_search->variables) == 0 || $database_fails) {
 			$query = new Querylet("SELECT * FROM images ");
 		}
+		else if(count($tag_search->variables) == 1 || $positive_tag_count == 1) {
+			$query = new Querylet(
+				"SELECT * FROM images WHERE images.id IN (SELECT image_id FROM tags WHERE tag = ?) ",
+				$tag_search->variables);
+		}
 		else {
 			$s_tag_array = array_map("sql_escape", $tag_search->variables);
 			$s_tag_list = join(', ', $s_tag_array);