diff --git a/QuickLook/Translations.config b/QuickLook/Translations.config
index 684efd329..05583ab0d 100644
--- a/QuickLook/Translations.config
+++ b/QuickLook/Translations.config
@@ -32,6 +32,7 @@
     <InfoPanel_FolderAndFile>({0} - {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>نسخ كمسار</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>نسخ بنجاح</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>تصغير</MW_Minimize>
   </ar>
   <hu-HU>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -63,6 +64,7 @@
     <InfoPanel_FolderAndFile>({0} és {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Másolás elérési útként</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Sikeres másolás</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Kis méret</MW_Minimize>
   </hu-HU>
   <sk>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -93,6 +95,7 @@
     <InfoPanel_FolderAndFile>({0} a {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Kopírovať ako cestu</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Úspešne skopírované</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Minimalizovať</MW_Minimize>
   </sk>
   <id-ID>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -124,6 +127,7 @@
     <InfoPanel_FolderAndFile>({0} dan {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Salin sebagai jalur</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Berhasil disalin</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Minimalkan</MW_Minimize>
   </id-ID>
   <ko>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -161,6 +165,7 @@
     <InfoPanel_CantPreventClosing>"닫힘 방지" 취소는 지원되지 않습니다</InfoPanel_CantPreventClosing>
     <InfoPanelMoreItem_CopyAsPath>경로로 복사</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>성공적으로 복사됨</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>최소화</MW_Minimize>
   </ko>
   <ca>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -190,6 +195,7 @@
     <InfoPanel_FolderAndFile>({0} i {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Copia com a camí</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Copiat correctament</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Minimitza</MW_Minimize>
   </ca>
   <de>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -229,6 +235,7 @@
     <InfoPanel_CantPreventClosing>Das Aufheben von "Anheften" wird nicht unterstützt.</InfoPanel_CantPreventClosing>
     <InfoPanelMoreItem_CopyAsPath>Als Pfad kopieren</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Erfolgreich kopiert</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Minimieren</MW_Minimize>
   </de>
   <en>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -268,6 +275,7 @@
     <InfoPanel_CantPreventClosing>Cancellation of "Prevent Closing" is not supported</InfoPanel_CantPreventClosing>
     <InfoPanelMoreItem_CopyAsPath>Copy as path</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Copy successfully</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Minimize</MW_Minimize>
   </en>
   <es>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -306,6 +314,7 @@
     <InfoPanel_FolderAndFile>({0} y {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Copiar como ruta</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Copiado exitosamente</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Minimizar</MW_Minimize>
   </es>
   <fr>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -340,6 +349,7 @@
     <InfoPanel_FolderAndFile>({0} et {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Copier comme chemin</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Copié avec succès</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Réduire</MW_Minimize>
   </fr>
   <it>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -374,6 +384,7 @@
     <InfoPanel_FolderAndFile>({0} e {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Copia come percorso</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Copiato con successo</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Riduci a icona</MW_Minimize>
   </it>
   <ja>
     <UI_FontFamily>Yu Gothic UI,Segoe UI,Meiryo UI,MS Gothic</UI_FontFamily>
@@ -413,6 +424,7 @@
     <InfoPanel_CantPreventClosing>「ピン留め」の解除はできません</InfoPanel_CantPreventClosing>
     <InfoPanelMoreItem_CopyAsPath>パスとしてコピー</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>正常にコピーされました</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>最小化</MW_Minimize>
   </ja>
   <nb-NO>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -442,6 +454,7 @@
     <InfoPanel_FolderAndFile>({0} og {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Kopier som sti</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Kopiert vellykket</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Minimer</MW_Minimize>
   </nb-NO>
   <nl-NL>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -471,6 +484,7 @@
     <InfoPanel_FolderAndFile>({0} en {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Kopiëren als pad</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Succesvol gekopieerd</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Minimaliseren</MW_Minimize>
   </nl-NL>
   <pl>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -510,6 +524,7 @@
     <InfoPanel_CantPreventClosing>Anulowanie dla funkcji blokady zamykania okna nie jest wspierane</InfoPanel_CantPreventClosing>
     <InfoPanelMoreItem_CopyAsPath>Kopiuj jako ścieżkę</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Skopiowano pomyślnie</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Minimalizuj</MW_Minimize>
   </pl>
   <pt-BR>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -549,6 +564,7 @@
     <InfoPanel_CantPreventClosing>Não é possível cancelar "Impedir fechamento"</InfoPanel_CantPreventClosing>
     <InfoPanelMoreItem_CopyAsPath>Copiar como caminho</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Copiado com sucesso</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Minimizar</MW_Minimize>
   </pt-BR>
   <pt-PT>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -578,6 +594,7 @@
     <InfoPanel_FolderAndFile>({0} e {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Copiar como caminho</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Copiado com sucesso</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Minimizar</MW_Minimize>
   </pt-PT>
   <ru-RU>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -614,6 +631,7 @@
     <InfoPanel_FolderAndFile>({0} и {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Копировать как путь</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Успешно скопировано</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Свернуть</MW_Minimize>
   </ru-RU>
   <tr-TR>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -645,6 +663,7 @@
     <InfoPanel_FolderAndFile>({0} ve {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Yol olarak kopyala</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Başarıyla kopyalandı</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Simge durumuna küçült</MW_Minimize>
   </tr-TR>
   <uk-UA>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -683,6 +702,7 @@
     <InfoPanel_FolderAndFile>({0} та {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Копіювати як шлях</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Успішно скопійовано</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Згорнути</MW_Minimize>
   </uk-UA>
   <vi>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -713,6 +733,7 @@
     <InfoPanel_FolderAndFile>({0} và {1})</InfoPanel_FolderAndFile>
     <InfoPanelMoreItem_CopyAsPath>Sao chép dưới dạng đường dẫn</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Sao chép thành công</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Thu nhỏ</MW_Minimize>
   </vi>
   <zh-CN>
     <UI_FontFamily>Segoe UI,Microsoft Yahei UI,Microsoft Yahei,SimSun</UI_FontFamily>
@@ -752,6 +773,7 @@
     <InfoPanel_CantPreventClosing>不可取消“阻止关闭”哟</InfoPanel_CantPreventClosing>
     <InfoPanelMoreItem_CopyAsPath>复制为路径</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>复制成功</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>最小化</MW_Minimize>
   </zh-CN>
   <zh-TW>
     <UI_FontFamily>Segoe UI,Microsoft JhengHei UI,Microsoft JhengHei,MingLiU</UI_FontFamily>
@@ -791,6 +813,7 @@
     <InfoPanel_CantPreventClosing>不可取消“阻止關閉”喲</InfoPanel_CantPreventClosing>
     <InfoPanelMoreItem_CopyAsPath>複製為路徑</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>複製成功</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>最小化</MW_Minimize>
   </zh-TW>
   <mr>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -820,6 +843,7 @@
     <InfoPanel_File>{0} फाइल</InfoPanel_File>
     <InfoPanel_Files>{0} फायली</InfoPanel_Files>
     <InfoPanel_FolderAndFile>({0} आणि {1})</InfoPanel_FolderAndFile>
+    <MW_Minimize>लहान करा</MW_Minimize>
   </mr>
   <hi>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -849,6 +873,7 @@
     <InfoPanel_File>{0} फ़ाइल</InfoPanel_File>
     <InfoPanel_Files>{0} फ़ाइलें</InfoPanel_Files>
     <InfoPanel_FolderAndFile>({0} तथा {1})</InfoPanel_FolderAndFile>
+    <MW_Minimize>छोटा करें</MW_Minimize>
   </hi>
   <he>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -880,6 +905,7 @@
     <InfoPanel_File>{0} קובץ</InfoPanel_File>
     <InfoPanel_Files>{0} קבצים</InfoPanel_Files>
     <InfoPanel_FolderAndFile>({0} ו{1})</InfoPanel_FolderAndFile>
+    <MW_Minimize>מזער</MW_Minimize>
   </he>
   <el>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -910,6 +936,7 @@
     <InfoPanel_File>{0} αρχείο</InfoPanel_File>
     <InfoPanel_Files>{0} αρχεία</InfoPanel_Files>
     <InfoPanel_FolderAndFile>({0} και {1})</InfoPanel_FolderAndFile>
+    <MW_Minimize>Ελαχιστοποίηση</MW_Minimize>
   </el>
 <sv>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -946,6 +973,7 @@
     <InfoPanel_Files>{0} filer</InfoPanel_Files>
     <InfoPanel_FolderAndFile>({0} och {1})</InfoPanel_FolderAndFile>
     <InfoPanel_CantPreventClosing>Det är inte möjligt att avbryta "Behåll öppet", stäng fönstret istället.</InfoPanel_CantPreventClosing>
+    <MW_Minimize>Minimera</MW_Minimize>
   </sv>
   <ro>
     <UI_FontFamily>Segoe UI</UI_FontFamily>
@@ -985,5 +1013,6 @@
     <InfoPanel_CantPreventClosing>Anularea opțiunii „Prevenire închidere” nu este acceptată.</InfoPanel_CantPreventClosing>
     <InfoPanelMoreItem_CopyAsPath>Copiere ca cale</InfoPanelMoreItem_CopyAsPath>
     <InfoPanelMoreItem_CopySucc>Copierea a reușit</InfoPanelMoreItem_CopySucc>
+    <MW_Minimize>Minimizare</MW_Minimize>
   </ro>
 </Translations>
diff --git a/QuickLook/ViewerWindow.xaml b/QuickLook/ViewerWindow.xaml
index 147cf9bc1..b9ebb6e1a 100644
--- a/QuickLook/ViewerWindow.xaml
+++ b/QuickLook/ViewerWindow.xaml
@@ -105,6 +105,11 @@
                             </Style>
                         </Button.Style>
                     </Button>
+                    <Button x:Name="buttonMinimizeWindow"
+                            Content="&#xE921;"
+                            DockPanel.Dock="Right"
+                            Style="{StaticResource CaptionButtonStyle}"
+                            Visibility="{Binding ShowInTaskbar, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}" />
                     <Button x:Name="buttonShare"
                             Content="&#xE72D;"
                             DockPanel.Dock="Right"
diff --git a/QuickLook/ViewerWindow.xaml.cs b/QuickLook/ViewerWindow.xaml.cs
index 7eb190af7..b40c279cf 100644
--- a/QuickLook/ViewerWindow.xaml.cs
+++ b/QuickLook/ViewerWindow.xaml.cs
@@ -133,6 +133,8 @@ internal ViewerWindow()
         buttonWindowStatus.Click += (_, _) =>
             WindowState = WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
 
+        buttonMinimizeWindow.Click += (_, _) => WindowState = WindowState.Minimized;
+
         buttonShare.Click += (_, _) => ShareHelper.Share(_path, this);
         buttonOpenWith.Click += (_, _) => ShareHelper.Share(_path, this, true);
 
@@ -162,6 +164,9 @@ internal ViewerWindow()
         };
 
         // Set UI translations
+        buttonMinimizeWindow.ToolTip = TranslationHelper.Get("MW_Minimize");
+        System.Windows.Automation.AutomationProperties.SetName(buttonMinimizeWindow,
+            TranslationHelper.Get("MW_Minimize"));
         buttonTop.ToolTip = TranslationHelper.Get("MW_StayTop");
         buttonPin.ToolTip = TranslationHelper.Get("MW_PreventClosing");
         buttonOpenWith.ToolTip = TranslationHelper.Get("MW_OpenWithMenu");