diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh
index 5a0f4ab4eb..c6b9b33e59 100644
--- a/multinode-demo/common.sh
+++ b/multinode-demo/common.sh
@@ -7,7 +7,13 @@ rsync=rsync
 if [[ -d "$SNAP" ]]; then # Running inside a Linux Snap?
   solana_program() {
     declare program="$1"
-    printf "%s/command-%s.wrapper" "$SNAP" "$program"
+    if [[ "$program" = wallet ]]; then
+      # TODO: Merge wallet.sh functionality into solana-wallet proper and
+      #       remove this special case
+      printf "%s/bin/solana-%s" "$SNAP" "$program"
+    else
+      printf "%s/command-%s.wrapper" "$SNAP" "$program"
+    fi
   }
   rsync="$SNAP"/bin/rsync
   SOLANA_CUDA="$(snapctl get enable-cuda)"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 437afee6c9..4db1c6ab22 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -44,7 +44,9 @@ apps:
   client-demo:
     command: solana-client-demo
   wallet:
-    command: solana-wallet
+    # TODO: Merge wallet.sh functionality into solana-wallet proper
+    command: wallet.sh
+    #command: solana-wallet
 
   daemon-validator:
     daemon: simple