diff --git a/core/frontend/src/components/video-manager/VideoThumbnail.vue b/core/frontend/src/components/video-manager/VideoThumbnail.vue
index 72bbe68331..68ab7a3f71 100644
--- a/core/frontend/src/components/video-manager/VideoThumbnail.vue
+++ b/core/frontend/src/components/video-manager/VideoThumbnail.vue
@@ -2,7 +2,7 @@
   <v-container class="d-flex flex-column align-center justify-space-between">
     <div
       class="thumbnail-frame d-flex align-center justify-center"
-      :style="{ width: width + 'px', aspectRatio: '16 / 9' }"
+      :style="{ width: parsedWidth, aspectRatio: '16 / 9' }"
     >
       <span
         v-if="disabled"
@@ -33,7 +33,7 @@
       <img
         v-else
         :src="thumbnail?.source"
-        style="width: 100%; height: 100%; object-fit: cover;"
+        style="width: 100%; height: 100%; object-fit: contain;"
       >
       <div
         v-if="is_pirate_mode && register"
@@ -60,6 +60,7 @@
       <div
         v-if="register"
         class="thumbnail-controls d-flex align-center"
+        @click.stop.prevent
       >
         <v-tooltip bottom>
           <template #activator="{ on, attrs }">
@@ -155,6 +156,9 @@ export default Vue.extend({
       return this.register && this.thumbnail === undefined
         && !this.continuous_mode && !this.snapshot_in_progress
     },
+    parsedWidth(): string {
+      return /^\d+$/.test(this.width) ? `${this.width}px` : this.width
+    },
     is_pirate_mode(): boolean {
       return settings.is_pirate_mode
     },
@@ -229,6 +233,7 @@ export default Vue.extend({
   overflow: hidden;
   border-radius: 4px;
   background: rgba(0, 0, 0, 0.08);
+  max-height: 100%;
 }
 
 .thumbnail-overlay {
diff --git a/core/frontend/src/views/MainView.vue b/core/frontend/src/views/MainView.vue
index 7d7f3e0f21..b53c382b8d 100644
--- a/core/frontend/src/views/MainView.vue
+++ b/core/frontend/src/views/MainView.vue
@@ -220,8 +220,7 @@ export default Vue.extend({
           props: {
             source,
             register: stream.running,
-            width: 'auto',
-            height: '100%',
+            width: '100%',
           },
           style: {
             display: 'flex',