diff --git a/textinput/keys.go b/textinput/keys.go
new file mode 100644
index 000000000..4eb9c87c4
--- /dev/null
+++ b/textinput/keys.go
@@ -0,0 +1,46 @@
+package textinput
+
+import "github.com/charmbracelet/bubbles/v2/key"
+
+// KeyMap is the key bindings for different actions within the textinput.
+type KeyMap struct {
+	CharacterForward        key.Binding
+	CharacterBackward       key.Binding
+	WordForward             key.Binding
+	WordBackward            key.Binding
+	DeleteWordBackward      key.Binding
+	DeleteWordForward       key.Binding
+	DeleteAfterCursor       key.Binding
+	DeleteBeforeCursor      key.Binding
+	DeleteCharacterBackward key.Binding
+	DeleteCharacterForward  key.Binding
+	LineStart               key.Binding
+	LineEnd                 key.Binding
+	Paste                   key.Binding
+	AcceptSuggestion        key.Binding
+	NextSuggestion          key.Binding
+	PrevSuggestion          key.Binding
+}
+
+// DefaultKeyMap is the default set of key bindings for navigating and acting
+// upon the textinput.
+func DefaultKeyMap() KeyMap {
+	return KeyMap{
+		CharacterForward:        key.NewBinding(key.WithKeys("right", "ctrl+f")),
+		CharacterBackward:       key.NewBinding(key.WithKeys("left", "ctrl+b")),
+		WordForward:             key.NewBinding(key.WithKeys("alt+right", "ctrl+right", "alt+f")),
+		WordBackward:            key.NewBinding(key.WithKeys("alt+left", "ctrl+left", "alt+b")),
+		DeleteWordBackward:      key.NewBinding(key.WithKeys("alt+backspace", "ctrl+w")),
+		DeleteWordForward:       key.NewBinding(key.WithKeys("alt+delete", "alt+d")),
+		DeleteAfterCursor:       key.NewBinding(key.WithKeys("ctrl+k")),
+		DeleteBeforeCursor:      key.NewBinding(key.WithKeys("ctrl+u")),
+		DeleteCharacterBackward: key.NewBinding(key.WithKeys("backspace", "ctrl+h")),
+		DeleteCharacterForward:  key.NewBinding(key.WithKeys("delete", "ctrl+d")),
+		LineStart:               key.NewBinding(key.WithKeys("home", "ctrl+a")),
+		LineEnd:                 key.NewBinding(key.WithKeys("end", "ctrl+e")),
+		Paste:                   key.NewBinding(key.WithKeys("ctrl+v")),
+		AcceptSuggestion:        key.NewBinding(key.WithKeys("tab")),
+		NextSuggestion:          key.NewBinding(key.WithKeys("down", "ctrl+n")),
+		PrevSuggestion:          key.NewBinding(key.WithKeys("up", "ctrl+p")),
+	}
+}
diff --git a/textinput/textinput.go b/textinput/textinput.go
index acf966cca..7019e28dc 100644
--- a/textinput/textinput.go
+++ b/textinput/textinput.go
@@ -42,49 +42,6 @@ const (
 // ValidateFunc is a function that returns an error if the input is invalid.
 type ValidateFunc func(string) error
 
-// KeyMap is the key bindings for different actions within the textinput.
-type KeyMap struct {
-	CharacterForward        key.Binding
-	CharacterBackward       key.Binding
-	WordForward             key.Binding
-	WordBackward            key.Binding
-	DeleteWordBackward      key.Binding
-	DeleteWordForward       key.Binding
-	DeleteAfterCursor       key.Binding
-	DeleteBeforeCursor      key.Binding
-	DeleteCharacterBackward key.Binding
-	DeleteCharacterForward  key.Binding
-	LineStart               key.Binding
-	LineEnd                 key.Binding
-	Paste                   key.Binding
-	AcceptSuggestion        key.Binding
-	NextSuggestion          key.Binding
-	PrevSuggestion          key.Binding
-}
-
-// DefaultKeyMap is the default set of key bindings for navigating and acting
-// upon the textinput.
-func DefaultKeyMap() KeyMap {
-	return KeyMap{
-		CharacterForward:        key.NewBinding(key.WithKeys("right", "ctrl+f")),
-		CharacterBackward:       key.NewBinding(key.WithKeys("left", "ctrl+b")),
-		WordForward:             key.NewBinding(key.WithKeys("alt+right", "ctrl+right", "alt+f")),
-		WordBackward:            key.NewBinding(key.WithKeys("alt+left", "ctrl+left", "alt+b")),
-		DeleteWordBackward:      key.NewBinding(key.WithKeys("alt+backspace", "ctrl+w")),
-		DeleteWordForward:       key.NewBinding(key.WithKeys("alt+delete", "alt+d")),
-		DeleteAfterCursor:       key.NewBinding(key.WithKeys("ctrl+k")),
-		DeleteBeforeCursor:      key.NewBinding(key.WithKeys("ctrl+u")),
-		DeleteCharacterBackward: key.NewBinding(key.WithKeys("backspace", "ctrl+h")),
-		DeleteCharacterForward:  key.NewBinding(key.WithKeys("delete", "ctrl+d")),
-		LineStart:               key.NewBinding(key.WithKeys("home", "ctrl+a")),
-		LineEnd:                 key.NewBinding(key.WithKeys("end", "ctrl+e")),
-		Paste:                   key.NewBinding(key.WithKeys("ctrl+v")),
-		AcceptSuggestion:        key.NewBinding(key.WithKeys("tab")),
-		NextSuggestion:          key.NewBinding(key.WithKeys("down", "ctrl+n")),
-		PrevSuggestion:          key.NewBinding(key.WithKeys("up", "ctrl+p")),
-	}
-}
-
 // Model is the Bubble Tea model for this text input element.
 type Model struct {
 	Err error
diff --git a/viewport/keymap.go b/viewport/keys.go
similarity index 94%
rename from viewport/keymap.go
rename to viewport/keys.go
index f8f0ca2ec..d9c503a9f 100644
--- a/viewport/keymap.go
+++ b/viewport/keys.go
@@ -1,5 +1,3 @@
-// Package viewport provides a component for rendering a viewport in a Bubble
-// Tea.
 package viewport
 
 import "github.com/charmbracelet/bubbles/v2/key"
diff --git a/viewport/viewport.go b/viewport/viewport.go
index 624e2912b..c2cf67876 100644
--- a/viewport/viewport.go
+++ b/viewport/viewport.go
@@ -1,3 +1,5 @@
+// Package viewport provides a component for rendering a viewport in a Bubble
+// Tea application.
 package viewport
 
 import (