diff --git a/choose/choose.go b/choose/choose.go
index 4bd3937..a694a7a 100644
--- a/choose/choose.go
+++ b/choose/choose.go
@@ -16,7 +16,6 @@ import (
 	"github.com/charmbracelet/bubbles/paginator"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/mattn/go-runewidth"
 )
 
 type model struct {
@@ -158,7 +157,7 @@ func (m model) View() string {
 		if i == m.index%m.height {
 			s.WriteString(m.cursorStyle.Render(m.cursor))
 		} else {
-			s.WriteString(strings.Repeat(" ", runewidth.StringWidth(m.cursor)))
+			s.WriteString(strings.Repeat(" ", lipgloss.Width(m.cursor)))
 		}
 
 		if item.selected {
diff --git a/filter/filter.go b/filter/filter.go
index 579c523..54df59e 100644
--- a/filter/filter.go
+++ b/filter/filter.go
@@ -17,7 +17,6 @@ import (
 	"github.com/charmbracelet/bubbles/viewport"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/mattn/go-runewidth"
 	"github.com/sahilm/fuzzy"
 )
 
@@ -77,7 +76,7 @@ func (m model) View() string {
 		if i == m.cursor {
 			s.WriteString(m.indicatorStyle.Render(m.indicator))
 		} else {
-			s.WriteString(strings.Repeat(" ", runewidth.StringWidth(m.indicator)))
+			s.WriteString(strings.Repeat(" ", lipgloss.Width(m.indicator)))
 		}
 
 		// If there are multiple selections mark them, otherwise leave an empty space
diff --git a/input/input.go b/input/input.go
index fbc84c5..0ad2e54 100644
--- a/input/input.go
+++ b/input/input.go
@@ -11,7 +11,6 @@ import (
 	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/mattn/go-runewidth"
 )
 
 type model struct {
@@ -41,7 +40,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tea.WindowSizeMsg:
 		if m.autoWidth {
-			m.textinput.Width = msg.Width - runewidth.StringWidth(m.textinput.Prompt) - 1
+			m.textinput.Width = msg.Width - lipgloss.Width(m.textinput.Prompt) - 1
 		}
 	case tea.KeyMsg:
 		switch msg.String() {
diff --git a/table/command.go b/table/command.go
index d771a3b..f25b991 100644
--- a/table/command.go
+++ b/table/command.go
@@ -8,7 +8,7 @@ import (
 	"github.com/alecthomas/kong"
 	"github.com/charmbracelet/bubbles/table"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/mattn/go-runewidth"
+	"github.com/charmbracelet/lipgloss"
 
 	"github.com/charmbracelet/gum/internal/stdin"
 	"github.com/charmbracelet/gum/style"
@@ -59,7 +59,7 @@ func (o Options) Run() error {
 	var columns = make([]table.Column, 0, len(columnNames))
 
 	for i, title := range columnNames {
-		width := runewidth.StringWidth(title)
+		width := lipgloss.Width(title)
 		if len(o.Widths) > i {
 			width = o.Widths[i]
 		}