diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index e7f67c8ace..2683a32dae 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -75,8 +75,12 @@ limitations under the License.
 .mx_TagPanel .mx_TagTile {
     // opacity: 0.5;
     position: relative;
+}
+
+.mx_TagPanel .mx_TagTile.mx_TagTile_prototype {
     padding: 3px;
 }
+
 .mx_TagPanel .mx_TagTile:focus,
 .mx_TagPanel .mx_TagTile:hover,
 .mx_TagPanel .mx_TagTile.mx_TagTile_selected {
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 562a478976..db5eedc274 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -144,6 +144,7 @@ export default createReactClass({
         const isPrototype = SettingsStore.getValue("feature_communities_v2_prototypes");
         const className = classNames({
             mx_TagTile: true,
+            mx_TagTile_prototype: isPrototype,
             mx_TagTile_selected: this.props.selected && !isPrototype,
             mx_TagTile_selected_prototype: this.props.selected && isPrototype,
         });
diff --git a/src/components/views/elements/UserTagTile.tsx b/src/components/views/elements/UserTagTile.tsx
index 635c537324..912f54edc7 100644
--- a/src/components/views/elements/UserTagTile.tsx
+++ b/src/components/views/elements/UserTagTile.tsx
@@ -66,6 +66,7 @@ export default class UserTagTile extends React.PureComponent<IProps, IState> {
         // TagTile instead if we continue to use this component.
         const className = classNames({
             mx_TagTile: true,
+            mx_TagTile_prototype: true,
             mx_TagTile_selected_prototype: this.state.selected,
             mx_TagTile_home: true,
         });