diff --git a/plugins/archive/app/archive.scss b/plugins/archive/app/archive.scss
index 7375b3301f..e0eb248346 100644
--- a/plugins/archive/app/archive.scss
+++ b/plugins/archive/app/archive.scss
@@ -64,10 +64,20 @@ minds-archive-theatre{
     left: 0;
     bottom: 0;
     right: 0;
-
+    .minds-img-landscape{
+      img{
+        width: 100%;
+        height: auto;
+      }
+    }
+    .minds-img-portrait{
+      img{
+        height: 100%;
+        width: auto;
+      }
+    }
     img{
-      max-width:100%;
-      height:100%;
+      object-fit: contain;
     }
     minds-video{
       background:#000;
diff --git a/plugins/archive/app/view/views/theatre.ts b/plugins/archive/app/view/views/theatre.ts
index 697d5b35a8..45883210f7 100644
--- a/plugins/archive/app/view/views/theatre.ts
+++ b/plugins/archive/app/view/views/theatre.ts
@@ -18,7 +18,7 @@ import { Material } from '../../../../directives/material';
       [hidden]="object.container_guid == object.owner_guid || !object.album_children_guids || object.album_children_guids.length <= 1">
         keyboard_arrow_left
     </i>
-    <div class="minds-archive-stage" *ngIf="object.subtype == 'image'">
+    <div class="minds-archive-stage" [ngClass]="{minds-image-landscape: orientation == 'landscape', minds-image-portrait: orientation == 'portrait'}" *ngIf="object.subtype == 'image'">
       <img src="/archive/thumbnail/{{object.guid}}/xlarge"/>
     </div>
     <div class="minds-archive-stage" *ngIf="object.subtype == 'video'">
@@ -44,6 +44,7 @@ import { Material } from '../../../../directives/material';
 export class ArchiveTheatre {
 
   object: any = {};
+  orientation: string;
   session = SessionFactory.build();
 
   constructor(public client: Client, public router: Router){
@@ -53,6 +54,14 @@ export class ArchiveTheatre {
     if(!value.guid)
       return;
     this.object = value;
+    if(this.object.subtype == 'image'){
+      /*Check image's aspect ratio for landscape or l*/
+      if(this.object.naturalWidth >= this.object.naturalHeight){
+        this.orientation = 'landscape';
+      } else {
+        this.orientation = 'portrait';
+      }
+    }
   }
 
   prev(){