diff --git a/docs/changelog.d/+claude-code-uri-handler.bugfix.md b/docs/changelog.d/+claude-code-uri-handler.bugfix.md
new file mode 100644
index 0000000..e2814f9
--- /dev/null
+++ b/docs/changelog.d/+claude-code-uri-handler.bugfix.md
@@ -0,0 +1 @@
+Register `claude-cli://` URI scheme handler on ringtail so Claude Code's OAuth browser callback completes instead of hanging Librewolf.
diff --git a/nixos/ringtail/configuration.nix b/nixos/ringtail/configuration.nix
index ac8e669..25475c4 100644
--- a/nixos/ringtail/configuration.nix
+++ b/nixos/ringtail/configuration.nix
@@ -361,6 +361,22 @@ in
       ];
     };
 
+    # Claude Code OAuth callback handler (claude-cli:// URI scheme)
+    xdg.desktopEntries.claude-code-url-handler = {
+      name = "Claude Code URL Handler";
+      exec = "/run/current-system/sw/bin/mise exec -- claude --handle-uri %u";
+      type = "Application";
+      noDisplay = true;
+      mimeType = [ "x-scheme-handler/claude-cli" ];
+    };
+
+    xdg.mimeApps = {
+      enable = true;
+      defaultApplications = {
+        "x-scheme-handler/claude-cli" = [ "claude-code-url-handler.desktop" ];
+      };
+    };
+
     programs.fuzzel = {
       enable = true;
       settings = {