diff --git a/src/manjaro_hello.py b/src/manjaro_hello.py
index 05878ce..3618f70 100644
--- a/src/manjaro_hello.py
+++ b/src/manjaro_hello.py
@@ -84,9 +84,11 @@ class ManjaroHello():
         self.save_preferences()
 
         # Set window subtitle
+        subtitle = ""
         if self.infos["codename"] and self.infos["release"]:
-            self.builder.get_object("headerbar").props.subtitle = self.infos["codename"] + " " + self.infos["release"] + " "
-        self.builder.get_object("headerbar").props.subtitle += self.infos["arch"]
+            subtitle += self.infos["codename"] + " " + self.infos["release"] + " "
+        subtitle += self.infos["arch"]
+        self.builder.get_object("headerbar").props.subtitle = subtitle
 
         # Load images
         for img in ("google+", "facebook", "twitter", "reddit"):