diff --git a/modules/modes/move.js b/modules/modes/move.js
index d46e8fd5f..3da82f224 100644
--- a/modules/modes/move.js
+++ b/modules/modes/move.js
@@ -125,9 +125,9 @@ export function modeMove(context, entityIDs, baseGraph) {
         _prevGraph = null;
         _cache = {};
 
-        behaviors.forEach(function(behavior) {
-            context.install(behavior);
-        });
+        context.features().forceVisible(entityIDs);
+
+        behaviors.forEach(context.install);
 
         context.surface()
             .on('mousemove.move', move)
@@ -161,6 +161,8 @@ export function modeMove(context, entityIDs, baseGraph) {
 
         d3_select(document)
             .call(keybinding.unbind);
+
+        context.features().forceVisible([]);
     };
 
 
@@ -172,4 +174,4 @@ export function modeMove(context, entityIDs, baseGraph) {
 
 
     return mode;
-}
+}
\ No newline at end of file
diff --git a/modules/modes/rotate.js b/modules/modes/rotate.js
index d9d98d209..6ad041dd4 100644
--- a/modules/modes/rotate.js
+++ b/modules/modes/rotate.js
@@ -114,6 +114,8 @@ export function modeRotate(context, entityIDs) {
 
 
     mode.enter = function() {
+        context.features().forceVisible(entityIDs);
+
         behaviors.forEach(context.install);
 
         context.surface()
@@ -144,6 +146,8 @@ export function modeRotate(context, entityIDs) {
 
         d3_select(document)
             .call(keybinding.unbind);
+
+        context.features().forceVisible([]);
     };
 
 
@@ -155,4 +159,4 @@ export function modeRotate(context, entityIDs) {
 
 
     return mode;
-}
+}
\ No newline at end of file