diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
index b4dc41e..5cc77e3 100644
--- a/.github/workflows/formatting.yml
+++ b/.github/workflows/formatting.yml
@@ -17,6 +17,8 @@
 
 jobs:
   formatting:
+    outputs:
+      commit_sha: ${{ steps.get_commit.outputs.commit_sha }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -76,3 +78,7 @@
           if [[ "${{ github.ref }}" == refs/heads/queue-main-* ]]; then
             git push -f https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/boldsoftware/sketch.git HEAD
           fi
+        
+      - name: Get commit SHA
+        id: get_commit
+        run: echo "commit_sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/queue-main.yml b/.github/workflows/queue-main.yml
index 3dd6713..9f66b42 100644
--- a/.github/workflows/queue-main.yml
+++ b/.github/workflows/queue-main.yml
@@ -35,7 +35,7 @@
 
   push-to-main:
     runs-on: ubuntu-latest
-    needs: [go-test, ui-test]
+    needs: [go-test, ui-test, formatting]
     permissions:
       contents: write
     steps:
@@ -47,6 +47,14 @@
         run: |
           git config --global user.name "GitHub Actions Bot"
           git config --global user.email "actions@github.com"
+          
+          # Check if we have a formatting commit SHA
+          if [[ "${{ needs.formatting.outputs.commit_sha }}" != "" ]]; then
+            echo "Using formatted commit: ${{ needs.formatting.outputs.commit_sha }}"
+            git fetch origin ${{ needs.formatting.outputs.commit_sha }}
+            git checkout ${{ needs.formatting.outputs.commit_sha }}
+          fi
+          
           git push https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/boldsoftware/sketch.git HEAD:main
         env:
           GITHUB_TOKEN: ${{ github.token }}