diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
new file mode 100644
index 000000000..07412def3
--- /dev/null
+++ b/.github/workflows/flatpak.yml
@@ -0,0 +1,20 @@
+on:
+  workflow_dispatch: {}
+
+name: Flatpak
+
+jobs:
+  flatpak:
+    name: "Flatpak"
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-43
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v2
+    - uses: flatpak/flatpak-github-actions/flatpak-builder@v4
+      with:
+        bundle: ghostty.flatpak
+        manifest-path: com.mitchellh.ghostty.yml
+        branch: tip
+        cache-key: flatpak-builder-${{ github.sha }}-v1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 440ee8313..0649b15b5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -92,6 +92,9 @@ jobs:
     - name: Test Dynamic Build
       run: nix develop -c zig build -Dstatic=false
 
+    - name: Test Flatpak and GTK Build
+      run: nix develop -c zig build -Dflatpak=true -Dapp-runtime=gtk
+
     - name: Test Wasm Build
       run: nix develop -c zig build wasm