2 files changed, 8 insertions, 1 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index d962a1d1af..92c41515fb 100644
--- a/modules/luci-base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
@@ -101,7 +101,8 @@ function trimws(s) {
 }
 
 function _(s, c) {
-	return (window.TR && TR[sfh(trimws(s))]) || s;
+	var k = (c != null ? trimws(c) + '\u0001' : '') + trimws(s);
+	return (window.TR && TR[sfh(k)]) || s;
 }
 
 function N_(n, s, p, c) {
@@ -730,6 +731,9 @@ if (typeof(window.CustomEvent) !== 'function') {
 }
 
 function cbi_dropdown_init(sb) {
+	if (sb && L.dom.findClassInstance(sb) instanceof L.ui.Dropdown)
+		return;
+
 	var dl = new L.ui.Dropdown(sb, null, { name: sb.getAttribute('name') });
 	return dl.bind(sb);
 }
diff --git a/modules/luci-base/htdocs/luci-static/resources/luci.js b/modules/luci-base/htdocs/luci-static/resources/luci.js
index 2cb346c81b..8d056ec03d 100644
--- a/modules/luci-base/htdocs/luci-static/resources/luci.js
+++ b/modules/luci-base/htdocs/luci-static/resources/luci.js
@@ -2554,6 +2554,9 @@
 			 * be found.
 			 */
 			data: function(node, key, val) {
+				if (!node || !node.getAttribute)
+					return null;
+
 				var id = node.getAttribute('data-idref');
 
 				/* clear all data */