diff --git a/ui/component/viewers/imageViewer.jsx b/ui/component/viewers/imageViewer.jsx
index cb7ffe801..d7a009e74 100644
--- a/ui/component/viewers/imageViewer.jsx
+++ b/ui/component/viewers/imageViewer.jsx
@@ -2,6 +2,7 @@
 import React from 'react';
 import Card from 'component/common/card';
 import ErrorText from 'component/common/error-text';
+import ZoomableImage from 'component/zoomableImage';
 
 type Props = {
   source: string,
@@ -21,7 +22,7 @@ function ImageViewer(props: Props) {
       )}
       {!loadingError && (
         <div className="file-viewer">
-          <img src={source} onError={() => setLoadingError(true)} />
+          <ZoomableImage src={source} onError={() => setLoadingError(true)} />
         </div>
       )}
     </React.Fragment>
diff --git a/ui/scss/component/_file-render.scss b/ui/scss/component/_file-render.scss
index dac8840f9..de87758db 100644
--- a/ui/scss/component/_file-render.scss
+++ b/ui/scss/component/_file-render.scss
@@ -726,3 +726,9 @@ video::-internal-media-controls-overlay-cast-button {
     }
   }
 }
+
+.file-page__image {
+  img {
+    cursor: pointer;
+  }
+}