diff --git a/js/admin/dist/app.js b/js/admin/dist/app.js
index bee498d02..6f599840b 100644
--- a/js/admin/dist/app.js
+++ b/js/admin/dist/app.js
@@ -1051,11 +1051,9 @@ var m = (function app(window, undefined) {
 
 	function checkView(data, view, cached, cachedControllers, controllers, views) {
 		var controller = getController(cached.views, view, cachedControllers, data.controller);
-		//Faster to coerce to number and check for NaN
-		var key = +(data && data.attrs && data.attrs.key);
 		data = pendingRequests === 0 || forcing || cachedControllers && cachedControllers.indexOf(controller) > -1 ? data.view(controller) : {tag: "placeholder"};
 		if (data.subtree === "retain") return data;
-		if (key === key) (data.attrs = data.attrs || {}).key = key;
+		(data.attrs = data.attrs || {}).key = key;
 		updateLists(views, controllers, view, controller);
 		return data;
 	}
@@ -20671,15 +20669,19 @@ System.register('flarum/helpers/listItems', ['flarum/components/Separator', 'fla
       var className = item.props ? item.props.itemClassName : item.itemClassName;
 
       if (isListItem) {
-        item.props.key = item.itemName;
+        item.attrs = item.attrs || {};
+        item.attrs.key = item.attrs.key || item.itemName;
       }
 
+      var space = new String(' ');
+      space.attrs = { key: '_space_' + item.itemName };
+
       return [isListItem ? item : m(
         'li',
         { className: classList([item.itemName ? 'item-' + item.itemName : '', className, active ? 'active' : '']),
           key: item.itemName },
         item
-      ), ' '];
+      ), space];
     });
   }
 
diff --git a/js/forum/dist/app.js b/js/forum/dist/app.js
index 1f63a9d40..741aa9e8f 100644
--- a/js/forum/dist/app.js
+++ b/js/forum/dist/app.js
@@ -1051,11 +1051,9 @@ var m = (function app(window, undefined) {
 
 	function checkView(data, view, cached, cachedControllers, controllers, views) {
 		var controller = getController(cached.views, view, cachedControllers, data.controller);
-		//Faster to coerce to number and check for NaN
-		var key = +(data && data.attrs && data.attrs.key);
 		data = pendingRequests === 0 || forcing || cachedControllers && cachedControllers.indexOf(controller) > -1 ? data.view(controller) : {tag: "placeholder"};
 		if (data.subtree === "retain") return data;
-		if (key === key) (data.attrs = data.attrs || {}).key = key;
+		(data.attrs = data.attrs || {}).key = key;
 		updateLists(views, controllers, view, controller);
 		return data;
 	}
@@ -29793,15 +29791,19 @@ System.register('flarum/helpers/listItems', ['flarum/components/Separator', 'fla
       var className = item.props ? item.props.itemClassName : item.itemClassName;
 
       if (isListItem) {
-        item.props.key = item.itemName;
+        item.attrs = item.attrs || {};
+        item.attrs.key = item.attrs.key || item.itemName;
       }
 
+      var space = new String(' ');
+      space.attrs = { key: '_space_' + item.itemName };
+
       return [isListItem ? item : m(
         'li',
         { className: classList([item.itemName ? 'item-' + item.itemName : '', className, active ? 'active' : '']),
           key: item.itemName },
         item
-      ), ' '];
+      ), space];
     });
   }
 
diff --git a/js/lib/helpers/listItems.js b/js/lib/helpers/listItems.js
index 3e5ad467c..1b94e151c 100644
--- a/js/lib/helpers/listItems.js
+++ b/js/lib/helpers/listItems.js
@@ -35,9 +35,13 @@ export default function listItems(items) {
     const className = item.props ? item.props.itemClassName : item.itemClassName;
 
     if (isListItem) {
-      item.props.key = item.itemName;
+      item.attrs = item.attrs || {};
+      item.attrs.key = item.attrs.key || item.itemName;
     }
 
+    const space = new String(' ');
+    space.attrs = {key: '_space_'+item.itemName};
+
     return [
       isListItem
         ? item
@@ -49,7 +53,7 @@ export default function listItems(items) {
             key={item.itemName}>
             {item}
           </li>,
-      ' '
+      space
     ];
   });
 }