diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index bec7a35b79..33a4b3a748 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -274,6 +274,7 @@ export default class ImageView extends React.Component {
         // image causing it translate in the wrong direction.
         const style = {
             cursor: cursor,
+            transition: this.state.moving ? null : "transform 200ms ease 0s",
             transform: `translateX(${translatePixelsX})
                         translateY(${translatePixelsY})
                         scale(${zoomPercentage})