diff --git a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
index 11e50fd7..90e56786 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -15,7 +15,7 @@ screens:
     values:
       title: Setting up Bazzite Arch
       condition:
-        run: grep -qv "bazzite-arch" <<< $(distrobox list)
+        run: grep -qvz "bazzite-arch" <<< $(distrobox list)
       show_terminal: true
       package_manager: yafti.plugin.run
       groups:
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
index 464abc2b..193fd276 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
@@ -19,10 +19,11 @@ install-bazzite-arch:
   mv ~/.steam/steamcmd ~/.steam/steamcmd.sh
   if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then
     cp ~/.local/share/applications/bazzite-arch-steam.desktop ~/Desktop
+    sed -i 's@Steam (Runtime)@Steam@g' ~/Desktop/bazzite-arch-steam.desktop
     cp ~/.local/share/applications/bazzite-arch-net.lutris.Lutris.desktop ~/Desktop
-    sleep 10
-    rm ~/Desktop/steam.desktop
   fi
+  sleep 10
+  [ ! -e ~/Desktop/steam.desktop ] || rm ~/Desktop/steam.desktop
 
 install-corectrl:
   echo 'Installing CoreCtrl...''