diff --git a/res/css/views/elements/_ImageView.scss b/res/css/views/elements/_ImageView.scss
index f904d31330..d864ad9adf 100644
--- a/res/css/views/elements/_ImageView.scss
+++ b/res/css/views/elements/_ImageView.scss
@@ -47,10 +47,6 @@ limitations under the License.
     max-height: 70vh;
     min-width: 100px;
     min-height: 100px;
-
-    &:hover {
-        cursor: grab;
-    }
 }
 
 .mx_ImageView_panel {
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index 073b9dddbd..51e700c481 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -264,6 +264,7 @@ export default class ImageView extends React.Component {
          * we would apply the translation to an already rotated
          * image causing it translate in the wrong direction. */
         const style = {
+            cursor: this.state.moving ? "grabbing" : "grab",
             transform: `translateX(${translatePixelsX})
                         translateY(${translatePixelsY})
                         scale(${zoomPercentage})