diff --git a/platform/representation/src/gestures/DropGesture.js b/platform/representation/src/gestures/DropGesture.js
index 0b5c0bf75a..4ef1b7a2b5 100644
--- a/platform/representation/src/gestures/DropGesture.js
+++ b/platform/representation/src/gestures/DropGesture.js
@@ -170,9 +170,9 @@ define(
                             //Don't go into edit mode for folders
                             if (domainObjectType!=='folder') {
                                 navigationService.setNavigation(editableDomainObject);
+                                editableDomainObject.getCapability('status').set('editing', true);
                             }
                             broadcastDrop(id, event);
-                            editableDomainObject.getCapability('status').set('editing', true);
                         });
                     }
                 }