From 6fb6f54cfaf13badcdb371dc2b4e11c36802a48e Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Fri, 27 Nov 2015 15:21:24 -0800
Subject: [PATCH] Fixed objects being dropped twice in fixed layout

---
 platform/commonUI/browse/src/BrowseObjectController.js | 6 ++++--
 platform/features/layout/bundle.json                   | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform/commonUI/browse/src/BrowseObjectController.js b/platform/commonUI/browse/src/BrowseObjectController.js
index e67e8baabc..f188557a0f 100644
--- a/platform/commonUI/browse/src/BrowseObjectController.js
+++ b/platform/commonUI/browse/src/BrowseObjectController.js
@@ -56,9 +56,11 @@ define(
             }
 
             function updateQueryParam(viewKey) {
-                var unlisten, priorRoute = $route.current;
+                var unlisten,
+                    priorRoute = $route.current,
+                    editMode = $scope.domainObject && $scope.domainObject.hasCapability('editor');
 
-                if (viewKey) {
+                if (viewKey && !editMode) {
                     $location.search('view', viewKey);
                     unlisten = $scope.$on('$locationChangeSuccess', function () {
                         // Checks path to make sure /browse/ is at front
diff --git a/platform/features/layout/bundle.json b/platform/features/layout/bundle.json
index 3f710d4371..b7cac9ad9e 100644
--- a/platform/features/layout/bundle.json
+++ b/platform/features/layout/bundle.json
@@ -19,7 +19,6 @@
                 "type": "telemetry.panel",
                 "templateUrl": "templates/fixed.html",
                 "uses": [ "composition" ],
-                "gestures": [ "drop" ],
                 "toolbar": {
                     "sections": [
                         {