diff --git a/src/steps/upgrade.vim b/src/steps/upgrade.vim
index 5eac813e..a901f2f5 100644
--- a/src/steps/upgrade.vim
+++ b/src/steps/upgrade.vim
@@ -33,23 +33,24 @@ if exists(":PaqUpdate")
     PaqUpdate
 endif
 
-if exists(":CocUpdateSync")
-    echo "CocUpdateSync"
-    CocUpdateSync
-endif
+function! UpdateCoCAndTS()
+    if exists(":CocUpdateSync")
+        echo "CocUpdateSync"
+        CocUpdateSync
+    endif
 
-" TODO: Should this be after `PackerSync`?
-" Not sure how to sequence this after Packer without doing something weird
-" with that `PackerComplete` autocommand.
-if exists(":TSUpdate")
-    echo "TreeSitter Update"
-    TSUpdate
-endif
+    if exists(":TSUpdateSync")
+        echo "TreeSitter Update"
+        TSUpdate
+    endif
+
+    quitall
+endfunction
 
 if exists(':PackerSync')
-  echo "Packer"
-  autocmd User PackerComplete quitall
-  PackerSync
+    echo "Packer"
+    autocmd User PackerComplete * call UpdateCoCAndTS()
+    PackerSync
 else
-  quitall
+    call UpdateCoCAndTS()
 endif