diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index 5a96f01d9f..2a6664d271 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -43,7 +43,6 @@ export default function DNDTagTile(props) {
                 type="draggable-TagTile"
             >
                 { (provided, snapshot) => (
-                    <div>
                         <div
                             ref={provided.innerRef}
                             {...provided.draggableProps}
@@ -55,9 +54,8 @@ export default function DNDTagTile(props) {
                                menuDisplayed={menuDisplayed}
                                openMenu={openMenu}
                             />
-                        </div>
                         { provided.placeholder }
-                    </div>
+                        </div>
                 ) }
             </Draggable>
                     {contextMenu}
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 023d9cca93..848dc797a2 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -159,8 +159,7 @@ export default createReactClass({
 
         const AccessibleTooltipButton = sdk.getComponent("elements.AccessibleTooltipButton");
 
-        return <div>
-            <AccessibleTooltipButton
+        return <AccessibleTooltipButton
                 className={className}
                 onClick={this.onClick}
                 onContextMenu={this.openMenu}
@@ -181,7 +180,6 @@ export default createReactClass({
                     { contextButton }
                     { badgeElement }
                 </div>
-            </AccessibleTooltipButton>
-        </div>;
+            </AccessibleTooltipButton>;
     },
 });