diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 74b326e987..80f927c89a 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -471,9 +471,8 @@ module.exports = React.createClass({
 
         var tagsSection = 
             <div className="mx_RoomSettings_tags">
-                Tagged as:
                 { canSetTag ?
-                    tags.map(function(tag, i) {
+                    ("Tagged as: " + tags.map(function(tag, i) {
                         return (<label key={ i }>
                                     <input type="checkbox"
                                            ref={ tag.ref }
@@ -481,7 +480,7 @@ module.exports = React.createClass({
                                            onChange={ self._onTagChange.bind(self, tag.name) }/>
                                     { tag.label }
                                 </label>);
-                    }) : (self.state.tags && self.state.tags.join) ? self.state.tags.join(", ") : "None"
+                    })) : (self.state.tags && self.state.tags.join) ? ("Tagged as: " +self.state.tags.join(", ")) : ""
                 }
             </div>