diff --git a/classes/article.php b/classes/article.php
index bf1e55662..e75af0e7a 100644
--- a/classes/article.php
+++ b/classes/article.php
@@ -284,4 +284,21 @@ class Article extends Handler_Protected {
 				"content" => $tags_str, "content_full" => $tags_str_full));
 	}
 
+
+	function completeTags() {
+		$search = db_escape_string($this->link, $_REQUEST["search"]);
+
+		$result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags
+				WHERE owner_uid = '".$_SESSION["uid"]."' AND
+				tag_name LIKE '$search%' ORDER BY tag_name
+				LIMIT 10");
+
+		print "<ul>";
+		while ($line = db_fetch_assoc($result)) {
+			print "<li>" . $line["tag_name"] . "</li>";
+		}
+		print "</ul>";
+	}
+
+
 }
diff --git a/classes/rpc.php b/classes/rpc.php
index a78e079ca..04b763c46 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -363,22 +363,6 @@ class RPC extends Handler_Protected {
 		print "</ul>";
 	}
 
-
-	function completeTags() {
-		$search = db_escape_string($this->link, $_REQUEST["search"]);
-
-		$result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags
-				WHERE owner_uid = '".$_SESSION["uid"]."' AND
-				tag_name LIKE '$search%' ORDER BY tag_name
-				LIMIT 10");
-
-		print "<ul>";
-		while ($line = db_fetch_assoc($result)) {
-			print "<li>" . $line["tag_name"] . "</li>";
-		}
-		print "</ul>";
-	}
-
 	function purge() {
 		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
 		$days = sprintf("%d", $_REQUEST["days"]);
diff --git a/js/viewfeed.js b/js/viewfeed.js
index be2b88f4d..31eff1b8a 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1114,7 +1114,7 @@ function editArticleTags(id) {
 	   	dojo.disconnect(tmph);
 
 			new Ajax.Autocompleter('tags_str', 'tags_choices',
-			   "backend.php?op=rpc&method=completeTags",
+			   "backend.php?op=article&method=completeTags",
 			   { tokens: ',', paramName: "search" });
 		});