diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f2d121..8e5e4c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.13...3.18)
 
-set(YEAR    "2023")
-set(VERSION "2.0.1")
+set(YEAR    "2025")
+set(VERSION "2.0.2")
 add_definitions(-D YEAR=\\""${YEAR}"\\")
 add_definitions(-D VERSION=\\""${VERSION}"\\")
 
diff --git a/src/Gui.cpp b/src/Gui.cpp
index 15ddd09..f655e6b 100644
--- a/src/Gui.cpp
+++ b/src/Gui.cpp
@@ -184,7 +184,16 @@ void TonemapperGui::setImage(const std::string &filename) {
     }
 
     m_imageDisplayHeight = SCREEN_HEIGHT_DEFAULT;
-    m_imageDisplayWidth  = SCREEN_HEIGHT_DEFAULT * int(m_image->getWidth() / m_image->getHeight());
+    m_imageDisplayWidth  = SCREEN_HEIGHT_DEFAULT;
+    float ratio = (float) m_image->getWidth() / (float) m_image->getHeight();
+    if (ratio > 1.f) {
+        m_imageDisplayHeight = SCREEN_WIDTH_DEFAULT / ratio;
+        m_imageDisplayWidth  = SCREEN_WIDTH_DEFAULT;
+    } else if (ratio < 1.f) {
+        m_imageDisplayHeight = SCREEN_HEIGHT_DEFAULT;
+        m_imageDisplayWidth  = SCREEN_HEIGHT_DEFAULT * ratio;
+    }
+
     m_screenSize = Vector2i(std::max(int(SCREEN_WIDTH_DEFAULT), m_imageDisplayWidth), m_imageDisplayHeight);
     set_size(Vector2i(m_screenSize));