diff --git a/cursor/cursor.go b/cursor/cursor.go
index d0dc4b3..cc928f0 100644
--- a/cursor/cursor.go
+++ b/cursor/cursor.go
@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 )
 
diff --git a/filepicker/filepicker.go b/filepicker/filepicker.go
index 5a5e5b6..b4c11ee 100644
--- a/filepicker/filepicker.go
+++ b/filepicker/filepicker.go
@@ -12,7 +12,7 @@ import (
 	"sync/atomic"
 
 	"github.com/charmbracelet/bubbles/v2/key"
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/dustin/go-humanize"
 )
diff --git a/go.mod b/go.mod
index 4d8ca79..14e036c 100644
--- a/go.mod
+++ b/go.mod
@@ -18,6 +18,7 @@ require (
 )
 
 require (
+	charm.land/bubbletea/v2 v2.0.0-beta.6.0.20251104195021-b8645799fe45 // indirect
 	github.com/aymanbagabas/go-udiff v0.3.1 // indirect
 	github.com/charmbracelet/colorprofile v0.3.2 // indirect
 	github.com/charmbracelet/ultraviolet v0.0.0-20251104185819-20e68c88fe84 // indirect
diff --git a/go.sum b/go.sum
index 7d9de5e..9f258d4 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,5 @@
+charm.land/bubbletea/v2 v2.0.0-beta.6.0.20251104195021-b8645799fe45 h1:fTulbdntGS0fp4xLeDO1+myFIwJNBNXO0pZ6SHs1oM0=
+charm.land/bubbletea/v2 v2.0.0-beta.6.0.20251104195021-b8645799fe45/go.mod h1:001PaYn0OSAHMEEZ5d2Oh3E6hA6vs5LtYvQOAZgIiao=
 github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
 github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
diff --git a/help/help.go b/help/help.go
index e97f5f8..502f297 100644
--- a/help/help.go
+++ b/help/help.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/charmbracelet/bubbles/v2/key"
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 )
 
diff --git a/list/defaultitem.go b/list/defaultitem.go
index 2057294..759eed2 100644
--- a/list/defaultitem.go
+++ b/list/defaultitem.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/charmbracelet/bubbles/v2/key"
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/charmbracelet/x/ansi"
 )
diff --git a/list/list.go b/list/list.go
index fbf3aa6..9f79712 100644
--- a/list/list.go
+++ b/list/list.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/charmbracelet/x/ansi"
 	"github.com/sahilm/fuzzy"
diff --git a/list/list_test.go b/list/list_test.go
index 90c5008..13be41a 100644
--- a/list/list_test.go
+++ b/list/list_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 )
 
 type item string
diff --git a/paginator/paginator.go b/paginator/paginator.go
index d5b786e..37b53e3 100644
--- a/paginator/paginator.go
+++ b/paginator/paginator.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 
 	"github.com/charmbracelet/bubbles/v2/key"
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 )
 
 // Type specifies the way we render pagination.
diff --git a/paginator/paginator_test.go b/paginator/paginator_test.go
index 162c057..9777af9 100644
--- a/paginator/paginator_test.go
+++ b/paginator/paginator_test.go
@@ -3,7 +3,7 @@ package paginator
 import (
 	"testing"
 
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 )
 
 func TestNew(t *testing.T) {
diff --git a/progress/progress.go b/progress/progress.go
index dc933df..e8ecb0e 100644
--- a/progress/progress.go
+++ b/progress/progress.go
@@ -9,7 +9,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/harmonica"
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/charmbracelet/x/ansi"
diff --git a/spinner/spinner.go b/spinner/spinner.go
index 2269df7..5886e32 100644
--- a/spinner/spinner.go
+++ b/spinner/spinner.go
@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 )
 
diff --git a/stopwatch/stopwatch.go b/stopwatch/stopwatch.go
index 89f36d2..65facfc 100644
--- a/stopwatch/stopwatch.go
+++ b/stopwatch/stopwatch.go
@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 )
 
 var lastID int64
diff --git a/table/table.go b/table/table.go
index 953ec12..0fd85b2 100644
--- a/table/table.go
+++ b/table/table.go
@@ -7,7 +7,7 @@ import (
 	"github.com/charmbracelet/bubbles/v2/help"
 	"github.com/charmbracelet/bubbles/v2/key"
 	"github.com/charmbracelet/bubbles/v2/viewport"
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/mattn/go-runewidth"
 )
diff --git a/textarea/textarea.go b/textarea/textarea.go
index eee7977..63b7c04 100644
--- a/textarea/textarea.go
+++ b/textarea/textarea.go
@@ -12,13 +12,13 @@ import (
 	"time"
 	"unicode"
 
+	tea "charm.land/bubbletea/v2"
 	"github.com/atotto/clipboard"
 	"github.com/charmbracelet/bubbles/v2/cursor"
 	"github.com/charmbracelet/bubbles/v2/internal/memoization"
 	"github.com/charmbracelet/bubbles/v2/internal/runeutil"
 	"github.com/charmbracelet/bubbles/v2/key"
 	"github.com/charmbracelet/bubbles/v2/viewport"
-	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/charmbracelet/x/ansi"
 	rw "github.com/mattn/go-runewidth"
diff --git a/textarea/textarea_test.go b/textarea/textarea_test.go
index ccbe2aa..e85be42 100644
--- a/textarea/textarea_test.go
+++ b/textarea/textarea_test.go
@@ -7,7 +7,7 @@ import (
 	"unicode"
 
 	"github.com/MakeNowJust/heredoc"
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/charmbracelet/x/ansi"
 )
diff --git a/textinput/styles.go b/textinput/styles.go
index 736217d..545b926 100644
--- a/textinput/styles.go
+++ b/textinput/styles.go
@@ -4,7 +4,7 @@ import (
 	"image/color"
 	"time"
 
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 )
 
diff --git a/textinput/textinput.go b/textinput/textinput.go
index c86f121..08118ca 100644
--- a/textinput/textinput.go
+++ b/textinput/textinput.go
@@ -12,7 +12,7 @@ import (
 	"github.com/charmbracelet/bubbles/v2/cursor"
 	"github.com/charmbracelet/bubbles/v2/internal/runeutil"
 	"github.com/charmbracelet/bubbles/v2/key"
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 	rw "github.com/mattn/go-runewidth"
 	"github.com/rivo/uniseg"
diff --git a/textinput/textinput_test.go b/textinput/textinput_test.go
index ea63001..b5e344b 100644
--- a/textinput/textinput_test.go
+++ b/textinput/textinput_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 )
 
 func Test_CurrentSuggestion(t *testing.T) {
diff --git a/timer/timer.go b/timer/timer.go
index c8e3bf3..163a14a 100644
--- a/timer/timer.go
+++ b/timer/timer.go
@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 )
 
 var lastID int64
diff --git a/viewport/viewport.go b/viewport/viewport.go
index a439aac..6a259cf 100644
--- a/viewport/viewport.go
+++ b/viewport/viewport.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/charmbracelet/bubbles/v2/key"
-	tea "github.com/charmbracelet/bubbletea/v2"
+	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/charmbracelet/x/ansi"
 )