diff --git a/src/Umbraco.Web.UI.Client/src/views/blockelements/imageblock/imageblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/blockelements/imageblock/imageblock.editor.html
index c77f19ba67..0b82d2202d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/blockelements/imageblock/imageblock.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/blockelements/imageblock/imageblock.editor.html
@@ -1,3 +1,3 @@
-<button type="button" class="btn-reset umb-outline blockelement-imageblock-editor" focus-when="{{moveFocusToBlock === block}}" ng-click="vm.editBlock(block)">
+<button type="button" class="btn-reset umb-outline blockelement-imageblock-editor blockelement__draggable-element" focus-when="{{moveFocusToBlock === block}}" ng-click="vm.editBlock(block)">
     <img src="{{block.content.temp_image}}">
 </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/blockelements/textareablock/textareablock.editor.html b/src/Umbraco.Web.UI.Client/src/views/blockelements/textareablock/textareablock.editor.html
index 405c8634b4..c64d42b6ac 100644
--- a/src/Umbraco.Web.UI.Client/src/views/blockelements/textareablock/textareablock.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/blockelements/textareablock/textareablock.editor.html
@@ -1,5 +1,5 @@
 
-<div class="blockelement-textareablock-editor"  ng-controller="Umbraco.Editors.TextAreaBlockElementEditorController as vm">
+<div class="blockelement-textareablock-editor blockelement__draggable-element"  ng-controller="Umbraco.Editors.TextAreaBlockElementEditorController as vm">
 
     <!-- TODO: Each block should be wrapper in a Block Element Editor directive, handling validation messages etc. -->