diff --git a/classes/feeds.php b/classes/feeds.php
index 77366deec..0f2bbf31e 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -417,8 +417,8 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= "<div class='hlLeft'>";
 
-					$reply['content'] .= "<input
-							type=\"checkbox\" onclick=\"toggleSelectRow(this)\"
+					$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
+							type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"
 							id=\"RCHK-$id\">";
 
 					$reply['content'] .= "$marked_pic";
@@ -520,8 +520,8 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= "<div>";
 
-					$reply['content'] .= "<input
-							type=\"checkbox\" onclick=\"toggleSelectRow(this, false, true)\"
+					$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
+							type=\"checkbox\" onclick=\"toggleSelectRow2(this, false, true)\"
 							id=\"RCHK-$id\">";
 
 					$reply['content'] .= "$marked_pic";
diff --git a/js/functions.js b/js/functions.js
index 175a00fc7..be12d257a 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -366,13 +366,9 @@ function toggleSelectRow2(sender, row, is_cdm) {
 }
 
 
-function toggleSelectRow(sender, row, is_cdm) {
+function toggleSelectRow(sender, row) {
 
-	if (!row)
-		if (!is_cdm)
-			row = sender.parentNode.parentNode;
-		else
-			row = sender.parentNode.parentNode.parentNode;
+	if (!row) row = sender.parentNode.parentNode;
 
 	if (sender.checked && !row.hasClassName('Selected'))
 		row.addClassName('Selected');
diff --git a/js/tt-rss.js b/js/tt-rss.js
index e47d5878a..9814718f0 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -737,9 +737,9 @@ function hotkey_handler(e) {
 		case "select_article_cursor":
 			var id = getArticleUnderPointer();
 			if (id) {
-				var cb = $("RCHK-" + id)
+				var cb = dijit.byId("RCHK-" + id);
 				if (cb) {
-					cb.checked = !cb.checked;
+					cb.attr("checked", !cb.attr("checked"));
 					toggleSelectRowById(cb, "RROW-" + id);
 					return false;
 				}
diff --git a/js/viewfeed.js b/js/viewfeed.js
index a907a05d6..6c25f6eeb 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -162,7 +162,11 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 					initHeadlinesMenu();
 
 					new_elems.each(function(child) {
-						if (!$("RCHK-" + child.id.replace("RROW-", "RCHK-"))) {
+						var cb = dijit.byId(child.id.replace("RROW-", "RCHK-"));
+
+						if (!cb) {
+							dojo.parser.parse(child);
+
 							if (!Element.visible(child))
 								new Effect.Appear(child, { duration : 0.5 });
 						} else {
@@ -212,7 +216,6 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
 		_infscroll_request_sent = 0;
 
-
 		notify("");
 
 	} catch (e) {
@@ -602,16 +605,16 @@ function moveToPost(mode, noscroll) {
 function toggleSelected(id, force_on) {
 	try {
 
-		var cb = $("RCHK-" + id);
+		var cb = dijit.byId("RCHK-" + id);
 		var row = $("RROW-" + id);
 
 		if (row) {
 			if (row.hasClassName('Selected') && !force_on) {
 				row.removeClassName('Selected');
-				if (cb) cb.checked = false;
+				if (cb) cb.attr("checked", false);
 			} else {
 				row.addClassName('Selected');
-				if (cb) cb.checked = true;
+				if (cb) cb.attr("checked", true);
 			}
 		}
 	} catch (e) {
@@ -897,52 +900,52 @@ function selectArticles(mode) {
 
 		children.each(function(child) {
 			var id = child.id.replace("RROW-", "");
-			var cb = $("RCHK-" + id);
+			var cb = dijit.byId("RCHK-" + id);
 
 			if (mode == "all") {
 				child.addClassName("Selected");
-				if (cb) cb.checked= true;
+				if (cb) cb.attr("checked", true);
 			} else if (mode == "unread") {
 				if (child.hasClassName("Unread")) {
 					child.addClassName("Selected");
-					if (cb) cb.checked = true;
+					if (cb) cb.attr("checked", true);
 				} else {
 					child.removeClassName("Selected");
-					if (cb) cb.checked = false;
+					if (cb) cb.attr("checked", false);
 				}
 			} else if (mode == "marked") {
 				var img = $("FMPIC-" + child.id.replace("RROW-", ""));
 
 				if (img && img.src.match("mark_set")) {
 					child.addClassName("Selected");
-					if (cb) cb.checked = true;
+					if (cb) cb.attr("checked", true);
 				} else {
 					child.removeClassName("Selected");
-					if (cb) cb.checked = false;
+					if (cb) cb.attr("checked", false);
 				}
 			} else if (mode == "published") {
 				var img = $("FPPIC-" + child.id.replace("RROW-", ""));
 
 				if (img && img.src.match("pub_set")) {
 					child.addClassName("Selected");
-					if (cb) cb.checked = true;
+					if (cb) cb.attr("checked", true);
 				} else {
 					child.removeClassName("Selected");
-					if (cb) cb.checked = false;
+					if (cb) cb.attr("checked", false);
 				}
 
 			} else if (mode == "invert") {
 				if (child.hasClassName("Selected")) {
 					child.removeClassName("Selected");
-					if (cb) cb.checked = false;
+					if (cb) cb.attr("checked", false);
 				} else {
 					child.addClassName("Selected");
-					if (cb) cb.checked = true;
+					if (cb) cb.attr("checked", true);
 				}
 
 			} else {
 				child.removeClassName("Selected");
-				if (cb) cb.checked = false;
+				if (cb) cb.attr("checked", false);
 			}
 		});
 
@@ -1633,10 +1636,10 @@ function isCdmMode() {
 function markHeadline(id) {
 	var row = $("RROW-" + id);
 	if (row) {
-		var check = $("RCHK-" + id);
+		var check = dijit.byId("RCHK-" + id);
 
 		if (check) {
-			check.checked = true;
+			check.attr("checked", true);
 		}
 
 		row.addClassName("Selected");