diff --git a/.github/workflows/merge_upstream_master.yml b/.github/workflows/merge_upstream_master.yml
index c5032c411a8..55417be56e4 100644
--- a/.github/workflows/merge_upstream_master.yml
+++ b/.github/workflows/merge_upstream_master.yml
@@ -109,6 +109,14 @@ jobs:
           git merge FETCH_HEAD
           git push origin
 
+      - name: Rebuild TGUI
+        if: |
+          git diff-tree --name-only -r $(git rev-parse HEAD~2) | grep "tgui/public/"
+        run: |
+          bash tgui/bin/tgui
+          git commit -m "Rebuild TGUI"
+          git push origin
+
       - name: Notify Failure
         if: failure() && env.FAIL_NOTIFIED != 'true'
         run: |