diff --git a/www/Utils.js b/www/Utils.js
index eec0cbb4..b3d0df7e 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -686,7 +686,7 @@ Ext.define('PBS.Utils', {
     },
 
     render_optional_namespace: function(value, metadata, record) {
-	if (!value) return '-'; // FIXME ??
+	if (!value) return `- (${gettext('Root')})`;
 	return Ext.String.htmlEncode(value);
     },
 
diff --git a/www/form/RemoteTargetSelector.js b/www/form/RemoteTargetSelector.js
index cc710eed..1a163b6a 100644
--- a/www/form/RemoteTargetSelector.js
+++ b/www/form/RemoteTargetSelector.js
@@ -91,7 +91,7 @@ Ext.define('PBS.form.RemoteNamespaceSelector', {
 
     valueField: 'ns',
     displayField: 'ns',
-    emptyText: PBS.Utils.render_optional_namespace(''),
+    emptyText: gettext('Root'),
     notFoundIsValid: true,
 
     matchFieldWidth: false,
@@ -103,7 +103,7 @@ Ext.define('PBS.form.RemoteNamespaceSelector', {
 		header: gettext('Namespace'),
 		sortable: true,
 		dataIndex: 'ns',
-		renderer: PBS.Utils.render_optional_namespace, // FIXME proper root-aware renderer
+		renderer: PBS.Utils.render_optional_namespace,
 		flex: 1,
 	    },
 	    {