diff --git a/shell/.shell-common b/shell/.shell-common
index 31b5cd8..a737fec 100644
--- a/shell/.shell-common
+++ b/shell/.shell-common
@@ -1,5 +1,11 @@
 # Git aliases
-alias gs="git status"
+gs() {
+  if jj root 2>/dev/null; then
+    jj show -s
+  else
+    git status
+  fi
+}
 
 # Calculator
 alias k="kalker"