diff --git a/frontends/sdl/src/main.rs b/frontends/sdl/src/main.rs
index 39c6b86d38a376a9668e11855262de4e773cf37c..172852ff2e53b99b2cae60fbb1c0e9b5248bfc82 100644
--- a/frontends/sdl/src/main.rs
+++ b/frontends/sdl/src/main.rs
@@ -59,7 +59,7 @@ impl Emulator {
         );
         self.graphics
             .window_mut()
-            .set_title(format!("{} - {}", TITLE, rom.title()).as_str())
+            .set_title(format!("{} [{}]", TITLE, rom.title()).as_str())
             .unwrap();
     }
 
diff --git a/src/rom.rs b/src/rom.rs
index 24db942a00fb3ff164bb199d41e7c28a98860286..04ccbec44555a6b8bb3ef701c9350187b95dc71e 100644
--- a/src/rom.rs
+++ b/src/rom.rs
@@ -335,12 +335,11 @@ impl Cartridge {
 
     pub fn set_title_offset(&mut self) {
         let mut offset: usize = 0;
-        for byte in &self.rom_data[0x0134..0x0143] {
-            if *byte != 0u8 {
-                offset += 1;
-                continue;
+        for byte in &self.rom_data[0x0134..=0x0143] {
+            if *byte == 0u8 {
+                break;
             }
-            break;
+            offset += 1;
         }
         self.title_offset = 0x0134 + offset;
     }
@@ -354,7 +353,11 @@ impl Cartridge {
 #[cfg_attr(feature = "wasm", wasm_bindgen)]
 impl Cartridge {
     pub fn title(&self) -> String {
-        String::from(std::str::from_utf8(&self.rom_data[0x0134..self.title_offset]).unwrap())
+        String::from(
+            std::str::from_utf8(&self.rom_data[0x0134..self.title_offset])
+                .unwrap()
+                .trim(),
+        )
     }
 
     pub fn rom_type(&self) -> RomType {