diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 8c790edc03..c843c08ce9 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -95,7 +95,10 @@ const TagPanel = React.createClass({
             />;
         });
         return <div className="mx_TagPanel">
-            <Droppable droppableId="tag-panel-droppable">
+            <Droppable
+                droppableId="tag-panel-droppable"
+                type="draggable-TagTile"
+            >
                 { (provided, snapshot) => (
                     <div
                         className="mx_TagPanel_tagTileContainer"
diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index e17ea52976..9d8ecc1da6 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -25,6 +25,7 @@ export default function DNDTagTile(props) {
             key={props.tag}
             draggableId={props.tag}
             index={props.index}
+            type="draggable-TagTile"
         >
             { (provided, snapshot) => (
                 <div>