diff --git a/interface/src/avatar/GrabManager.cpp b/interface/src/avatar/GrabManager.cpp
index c41435d67e..db1337b64d 100644
--- a/interface/src/avatar/GrabManager.cpp
+++ b/interface/src/avatar/GrabManager.cpp
@@ -18,6 +18,8 @@ void GrabManager::simulateGrabs() {
     // Update grabbed objects
     auto entityTreeRenderer = DependencyManager::get<EntityTreeRenderer>();
     auto entityTree = entityTreeRenderer->getTree();
+    auto sessionID = DependencyManager::get<NodeList>()->getSessionUUID();
+    EntityEditPacketSender* packetSender = entityTreeRenderer ? entityTreeRenderer->getPacketSender() : nullptr;
     entityTree->withReadLock([&] {
         PROFILE_RANGE(simulation, "Grabs");
 
@@ -33,6 +35,8 @@ void GrabManager::simulateGrabs() {
                 glm::vec3 finalPosition = acc.finalizePosition();
                 glm::quat finalOrientation = acc.finalizeOrientation();
                 grabbedThing->setTransform(createMatFromQuatAndPos(finalOrientation, finalPosition));
+                bool iShouldTellServer = grabbedThing->getEditSenderID() == sessionID;
+                entityTree->updateEntityQueryAACube(grabbedThing, packetSender, false, iShouldTellServer);
             }
         }
     });
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 7b5f6e4066..436da476bf 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -3349,7 +3349,8 @@ void EntityItem::prepareForSimulationOwnershipBid(EntityItemProperties& properti
 }
 
 bool EntityItem::isWearable() const {
-    return isVisible() && (getParentID() == DependencyManager::get<NodeList>()->getSessionUUID() || getParentID() == AVATAR_SELF_ID);
+    return isVisible() &&
+        (getParentID() == DependencyManager::get<NodeList>()->getSessionUUID() || getParentID() == AVATAR_SELF_ID);
 }
 
 void EntityItem::addGrab(GrabPointer grab) {
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index fb1a11d43f..26a5a14039 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -2982,6 +2982,7 @@ void EntityTree::updateEntityQueryAACubeWorker(SpatiallyNestablePointer object,
                 properties.setLastEdited(now);
 
                 packetSender->queueEditEntityMessage(PacketType::EntityEdit, getThisPointer(), entity->getID(), properties);
+                entity->setLastEdited(now); // so we ignore the echo from the server
                 entity->setLastBroadcast(now); // for debug/physics status icons
             }
 
diff --git a/scripts/system/libraries/controllerDispatcherUtils.js b/scripts/system/libraries/controllerDispatcherUtils.js
index faf4b4ed5d..78c50a2318 100644
--- a/scripts/system/libraries/controllerDispatcherUtils.js
+++ b/scripts/system/libraries/controllerDispatcherUtils.js
@@ -33,6 +33,7 @@
    getGrabbableData:true,
    isAnothersAvatarEntity:true,
    isAnothersChildEntity:true,
+   entityIsEquippable:true,
    entityIsGrabbable:true,
    entityIsDistanceGrabbable:true,
    getControllerJointIndexCacheTime:true,
@@ -332,10 +333,18 @@ entityIsEquippable = function (eieProps) {
         return false;
     }
     return true;
-}
+};
 
 entityIsGrabbable = function (eigProps) {
-    return entityIsEquippable(eigProps) && !eigProps.locked;
+    var grabbable = getGrabbableData(eigProps).grabbable;
+    if (!grabbable ||
+        eigProps.locked ||
+        isAnothersAvatarEntity(eigProps) ||
+        isAnothersChildEntity(eigProps) ||
+        FORBIDDEN_GRAB_TYPES.indexOf(eigProps.type) >= 0) {
+        return false;
+    }
+    return true;
 };
 
 clearHighlightedEntities = function() {