diff --git a/bin/notarize_vimr.sh b/bin/notarize_vimr.sh
index f07e723d..92af1355 100755
--- a/bin/notarize_vimr.sh
+++ b/bin/notarize_vimr.sh
@@ -19,12 +19,14 @@ main() {
     echo "#### Uploaded"
     echo "Use 'xcrun altool --notarization-history 0 -u hataewon@gmail.com -p @keychain:dev-notar' or"
     echo "'xcrun altool --notarization-info ${request_uuid} -u hataewon@gmail.com -p @keychain:dev-notar'"
+  popd >/dev/null
 
-    pushd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null
-      echo "#### Waiting for notarization ${request_uuid} to finish"
-      ./bin/wait_for_notarization.py
-    popd >/dev/null
+  pushd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null
+    echo "#### Waiting for notarization ${request_uuid} to finish"
+    ./bin/wait_for_notarization.py
+  popd </dev/null
 
+  pushd "${vimr_app_path}/.." >/dev/null
     xcrun stapler staple VimR.app
     echo "### Notarization finished"
   popd >/dev/null
diff --git a/bin/wait_for_notarization.py b/bin/wait_for_notarization.py
index 5407e063..bbd300a7 100755
--- a/bin/wait_for_notarization.py
+++ b/bin/wait_for_notarization.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python3
+#!/usr/bin/env python3
 
 from waiting import wait, TimeoutExpired
 import os