diff --git a/Source/Core/MacUpdater/CMakeLists.txt b/Source/Core/MacUpdater/CMakeLists.txt
index 60abe88792..b27b466df9 100644
--- a/Source/Core/MacUpdater/CMakeLists.txt
+++ b/Source/Core/MacUpdater/CMakeLists.txt
@@ -54,6 +54,10 @@ foreach(sb ${STORYBOARDS})
 endforeach()
 
 if(MACOS_CODE_SIGNING)
-  add_custom_command(TARGET MacUpdater POST_BUILD
-    COMMAND /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options runtime $<TARGET_BUNDLE_DIR:MacUpdater>)
+  add_custom_command(TARGET MacUpdater
+    POST_BUILD
+    COMMAND "${CMAKE_SOURCE_DIR}/Tools/mac-codesign.sh"
+    "${MACOS_CODE_SIGNING_IDENTITY}"
+    "$<TARGET_BUNDLE_DIR:MacUpdater>"
+  )
 endif()
diff --git a/Tools/mac-codesign.sh b/Tools/mac-codesign.sh
index 9fb330bc6c..2b26d461ee 100755
--- a/Tools/mac-codesign.sh
+++ b/Tools/mac-codesign.sh
@@ -52,7 +52,7 @@ if [ -d "$TARGET_PATH" ]; then
   # Newlines are the only valid separator character in find's output.
   IFS=$'\n'
 
-  for framework in $(find "$TARGET_PATH" -not -path "*/Helpers/*" -name '*.dylib' -or -name '*.framework'); do
+  for framework in $(find "$TARGET_PATH" -depth -not -path "*/Helpers/*" -name '*.dylib' -or -name '*.framework'); do
     sign "$framework"
   done