diff --git a/qui/updater.glade b/qui/updater.glade
index a306ea8d..30c4937b 100644
--- a/qui/updater.glade
+++ b/qui/updater.glade
@@ -584,6 +584,8 @@ Selected qubes will be automatically started if necessary and shutdown after suc
                         <property name="margin-top">30</property>
                         <property name="margin-bottom">5</property>
                         <property name="label" translatable="yes">The following qubes need to be restarted to use an updated template (to configure restarting qubes by default, go to 'Updater Settings' in the top right corner of this window):</property>
+                        <property name="use-markup">True</property>
+                        <property name="wrap">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/qui/updater/updater.py b/qui/updater/updater.py
index 134e97f8..9e0c516c 100644
--- a/qui/updater/updater.py
+++ b/qui/updater/updater.py
@@ -227,12 +227,13 @@ def cell_data_func(_column, cell, model, it, data):
         width = self.intro_page.vm_list.get_preferred_width().natural_width
         # Wide enough for details section to show update progress.
         # But still less than 1024 pixels to do not break OpenQA tests.
+        screen = self.main_window.get_screen()
         width = max(width, 1000)
-        width = min(width, self.main_window.get_screen().get_width() - 12)
-        height = min(
-            int(width * 1.2), self.main_window.get_screen().get_height() - 48
-        )
+        width = min(width, screen.get_width() - 12)
+        height = min(int(width * 1.2), screen.get_height() - 100)
         self.main_window.resize(width + 50, height)
+        if screen.get_width() <= 1024 or screen.get_height() < 768:
+            self.main_window.maximize()
         self.main_window.set_size_request(800, 600)  # Smaller is meaningless
         self.main_window.set_position(Gtk.WindowPosition.CENTER_ALWAYS)