diff --git a/res/css/views/elements/_ImageView.scss b/res/css/views/elements/_ImageView.scss
index 10553a1c54..a2ca9c7927 100644
--- a/res/css/views/elements/_ImageView.scss
+++ b/res/css/views/elements/_ImageView.scss
@@ -26,21 +26,15 @@ limitations under the License.
 
 .mx_ImageView_content {
     width: 100%;
-    height: 100%;
 
     display: flex;
     flex-direction: column;
-}
 
-.mx_ImageView_imageBox {
     overflow: hidden;
-    display: flex;
-    padding: 0 50px 50px 50px;
-    flex-grow: 1;
 }
 
 .mainImage {
-    margin: auto;
+    //margin: auto;
 
     &:hover {
         cursor: grab;
@@ -56,6 +50,8 @@ limitations under the License.
     display: flex;
     justify-content: space-between;
     padding: 50px;
+    position: absolute;
+    width: 100%;
 }
 
 .mx_ImageView_toolbar {
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index 8cc55e40bf..9d747463f9 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -290,19 +290,17 @@ export default class ImageView extends React.Component {
                             </AccessibleButton>
                         </div>
                     </div>
-                    <div className="mx_ImageView_imageBox">
-                        <img
-                            src={this.props.src}
-                            title={this.props.name}
-                            style={style}
-                            className="mainImage"
-                            draggable={true}
-                            onMouseDown={this.onStartMoving}
-                            onMouseMove={this.onMoving}
-                            onMouseUp={this.onEndMoving}
-                            onMouseLeave={this.onEndMoving}
-                        />
-                    </div>
+                    <img
+                        src={this.props.src}
+                        title={this.props.name}
+                        style={style}
+                        className="mainImage"
+                        draggable={true}
+                        onMouseDown={this.onStartMoving}
+                        onMouseMove={this.onMoving}
+                        onMouseUp={this.onEndMoving}
+                        onMouseLeave={this.onEndMoving}
+                    />
                 </div>
             </FocusLock>
         );