diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index ab1d4feac3..a76c04805d 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -25,7 +25,7 @@ limitations under the License.
     justify-content: space-between;
 }
 
-.mx_TagPanel .mx_TagPanel_clearButton {
+.mx_TagPanel .mx_TagPanel_clearButton_container {
     /* Constant height within flex mx_TagPanel */
     height: 70px;
     width: 60px;
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 77259c863d..6b6b09c5dc 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -127,7 +127,9 @@ const TagPanel = React.createClass({
         }
 
         return <div className="mx_TagPanel">
-            { clearButton }
+            <div className="mx_TagPanel_clearButton_container">
+                { clearButton }
+            </div>
             <div className="mx_TagPanel_divider" />
             <GeminiScrollbarWrapper
                 className="mx_TagPanel_scroller"