diff --git a/data/gtk/window.blp b/data/gtk/window.blp
index 5e7b172..2ff8f0f 100644
--- a/data/gtk/window.blp
+++ b/data/gtk/window.blp
@@ -133,7 +133,7 @@ template $CartridgesWindow : Adw.ApplicationWindow {
                 }
 
                 Label details_view_developer {
-                  margin-top: 3;
+                  margin-top: 6;
                   hexpand: true;
                   halign: start;
                   max-width-chars: 36;
@@ -148,7 +148,7 @@ template $CartridgesWindow : Adw.ApplicationWindow {
 
                 Box {
                   orientation: horizontal;
-                  margin-top: 12;
+                  margin-top: 16;
                   hexpand: true;
                   halign: start;
 
@@ -188,7 +188,7 @@ template $CartridgesWindow : Adw.ApplicationWindow {
                     halign: start;
                     valign: center;
                     margin-top: 24;
-                    margin-start: 12;
+                    margin-start: 9;
 
                     Button {
                       icon-name: "document-edit-symbolic";
diff --git a/data/screenshots/3.png b/data/screenshots/3.png
index b59b5da..35843d9 100644
Binary files a/data/screenshots/3.png and b/data/screenshots/3.png differ
diff --git a/src/window.py b/src/window.py
index b3166e8..5befc56 100644
--- a/src/window.py
+++ b/src/window.py
@@ -234,8 +234,8 @@ class CartridgesWindow(Adw.ApplicationWindow):
 
         if self.stack.get_visible_child() != self.details_view:
             self.navigate(self.details_view)
+            self.set_focus(self.details_view_play_button)
 
-        self.set_focus(self.details_view_play_button)
         self.set_details_view_opacity()
 
     def set_details_view_opacity(self, *_args):