diff --git a/Containerfile b/Containerfile
index d3bb7641..df587248 100644
--- a/Containerfile
+++ b/Containerfile
@@ -101,6 +101,7 @@ RUN if grep -v "gnome" <<< "${IMAGE_NAME}"; then \
         gnome-shell-extension-appindicator \
         gnome-shell-extension-gsconnect \
         gnome-shell-extension-system76-scheduler && \
+        openssh-askpass \
     rpm-ostree override remove \
         gnome-tour \
         yelp \
diff --git a/system_files/desktop/shared/etc/profile.d/askpass.sh b/system_files/desktop/shared/etc/profile.d/askpass.sh
index 9c663f19..8a458dd9 100755
--- a/system_files/desktop/shared/etc/profile.d/askpass.sh
+++ b/system_files/desktop/shared/etc/profile.d/askpass.sh
@@ -1,2 +1,7 @@
-SUDO_ASKPASS='/usr/bin/ksshaskpass'
+#!/usr/bin/env bash
+if grep -qv "gnome" <<< $(cat /etc/default/bazzite); then
+  SUDO_ASKPASS='/usr/bin/ksshaskpass'
+else
+  SUDO_ASKPASS='/usr/libexec/openssh/gnome-ssh-askpass'
+fi
 export SUDO_ASKPASS