diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index e8ffa3438d..08e69280fe 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -28,23 +28,31 @@
                 <span class="c-cs-button__label">Add Condition</span>
             </button>
         </div>
-        <div class="condition-collection">
-            <div v-for="conditionIdentifier in conditionCollection"
-                 :key="conditionIdentifier.key"
-                 class="conditionArea"
-            >
-                <div v-if="isEditing">
-                    <ConditionEdit :condition-identifier="conditionIdentifier"
+        <div class="c-c condition-collection">
+            <div id="js-c-drag-ghost"
+                 class="c-c__drag-ghost"
+            ></div>
+            <div class="c-c__container-holder">
+                <div v-for="conditionIdentifier in conditionCollection"
+                     :key="conditionIdentifier.key"
+                >
+                    <div class="c-c__drop-hint">
+                        <div class="c-drop-hint c-drop-hint"></div>
+                    </div>
+
+                    <div v-if="isEditing">
+                        <ConditionEdit :condition-identifier="conditionIdentifier"
+                                       :current-condition-identifier="currentConditionIdentifier"
+                                       @update-current-condition="updateCurrentCondition"
+                                       @remove-condition="removeCondition"
+                                       @condition-result-updated="handleConditionResult"
+                        />
+                    </div>
+                    <div v-else>
+                        <Condition :condition-identifier="conditionIdentifier"
                                    :current-condition-identifier="currentConditionIdentifier"
-                                   @update-current-condition="updateCurrentCondition"
-                                   @remove-condition="removeCondition"
-                                   @condition-result-updated="handleConditionResult"
-                    />
-                </div>
-                <div v-else>
-                    <Condition :condition-identifier="conditionIdentifier"
-                               :current-condition-identifier="currentConditionIdentifier"
-                    />
+                        />
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index 034a39a713..a157876ede 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -1,7 +1,8 @@
 <template>
 <div v-if="condition"
-     class="c-cs-editui__conditions"
+     class="c-c-editui__conditions c-c-container__container c-c__drag-wrapper"
      :class="['widget-condition', { 'widget-condition--current': currentConditionIdentifier && (currentConditionIdentifier.key === conditionIdentifier.key) }]"
+     draggable="true"
 >
     <div class="title-bar">
         <span
@@ -150,8 +151,8 @@ export default {
         currentConditionIdentifier: {
             type: Object,
             required: true
-        }
-    },
+        },
+     },
     data() {
         return {
             condition: this.condition,