diff --git a/todo/list.go b/todo/list.go
index d4576832..9783cb4f 100644
--- a/todo/list.go
+++ b/todo/list.go
@@ -1,6 +1,8 @@
 package todo
 
-import ()
+import (
+	"fmt"
+)
 
 type List struct {
 	Items []*Item
@@ -8,6 +10,18 @@ type List struct {
 	selected int
 }
 
+/* -------------------- Exported Functions -------------------- */
+
+func (list *List) Add(text string) {
+	item := Item{
+		Checked: false,
+		Text:    text,
+	}
+
+	list.Items = append([]*Item{&item}, list.Items...)
+	fmt.Println("added")
+}
+
 func (list *List) Delete() {
 	list.Items = append(list.Items[:list.selected], list.Items[list.selected+1:]...)
 }
@@ -46,6 +60,14 @@ func (list *List) Promote() {
 	list.selected = j
 }
 
+func (list *List) Selected() *Item {
+	if list.selected < 0 || list.selected >= len(list.Items) {
+		return nil
+	}
+
+	return list.Items[list.selected]
+}
+
 // Toggle switches the checked state of the selected item
 func (list *List) Toggle() {
 	list.Items[list.selected].Toggle()
diff --git a/todo/widget.go b/todo/widget.go
index bbb5ee3b..f95e0c79 100644
--- a/todo/widget.go
+++ b/todo/widget.go
@@ -18,15 +18,17 @@ var Config *config.Config
 type Widget struct {
 	wtf.TextWidget
 
+	app      *tview.Application
 	pages    *tview.Pages
 	filePath string
 	list     *List
 }
 
-func NewWidget(pages *tview.Pages) *Widget {
+func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
 	widget := Widget{
 		TextWidget: wtf.NewTextWidget(" 📝 Todo ", "todo"),
 
+		app:      app,
 		pages:    pages,
 		filePath: Config.UString("wtf.mods.todo.filename"),
 		list:     &List{selected: -1},
@@ -53,18 +55,39 @@ func (widget *Widget) Refresh() {
 /* -------------------- Unexported Functions -------------------- */
 
 // edit opens a modal dialog that permits editing the text of the currently-selected item
-func (widget *Widget) edit() {
-	modal := tview.NewModal().
-		SetText("Do you want to quit the application?").
-		AddButtons([]string{"Quit", "Cancel"}).
-		SetDoneFunc(func(buttonIndex int, buttonLabel string) {
-			if buttonLabel == "Quit" {
-				widget.pages.RemovePage("edit")
-			}
-		})
+func (widget *Widget) editItem() {
+	if widget.list.Selected() == nil {
+		return
+	}
+
+	_, _, w, h := widget.View.GetInnerRect()
+
+	form := tview.NewForm().
+		SetButtonsAlign(tview.AlignCenter).
+		SetButtonTextColor(tview.Styles.PrimaryTextColor)
+
+	form.AddInputField("New text:", widget.selectedText(), 60, nil, nil)
+
+	form.AddButton("Save", func() {
+		fld := form.GetFormItem(0)
+
+		widget.updateItem(fld.(*tview.InputField).GetText())
+		widget.pages.RemovePage("modal")
+		widget.app.SetFocus(widget.View)
+		widget.persist()
+		widget.display()
+	})
+
+	frame := tview.NewFrame(form).SetBorders(0, 0, 0, 0, 0, 0)
+	frame.SetBorder(true)
+	frame.SetRect(w+20, h+2, 80, 7)
+
+	widget.pages.AddPage("modal", frame, false, true)
+	widget.app.SetFocus(frame)
+}
+
+func (widget *Widget) newItem() {
 
-	widget.pages.AddPage("edit", modal, false, true)
-	//widget.app.SetFocus(modal)
 }
 
 func (widget *Widget) init() {
@@ -82,28 +105,26 @@ func (widget *Widget) keyboardIntercept(event *tcell.EventKey) *tcell.EventKey {
 		widget.persist()
 		widget.display()
 		return nil
-	case "e":
-		// Edit selected item
-		widget.edit()
-		return nil
 	case "h":
 		// Show help menu
 		fmt.Println("HELP!")
 		return nil
 	case "j":
+		// Select the next item down
 		widget.list.Next()
 		widget.display()
 		return nil
 	case "k":
+		// Select the next item up
 		widget.list.Prev()
 		widget.display()
 		return nil
 	case "n":
 		// Add a new item
+		widget.newItem()
 		return nil
 	case "o":
 		// Open the file
-		//widget.openFile()
 		wtf.OpenFile(widget.filePath)
 		return nil
 	}
@@ -132,6 +153,9 @@ func (widget *Widget) keyboardIntercept(event *tcell.EventKey) *tcell.EventKey {
 		widget.list.Next()
 		widget.display()
 		return nil
+	case tcell.KeyEnter:
+		widget.editItem()
+		return nil
 	case tcell.KeyEsc:
 		// Unselect the current row
 		widget.list.Unselect()
@@ -170,3 +194,25 @@ func (widget *Widget) persist() {
 		panic(err)
 	}
 }
+
+func (widget *Widget) selectedText() string {
+	selectedItem := widget.list.Selected()
+
+	if selectedItem == nil {
+		return ""
+	} else {
+		return selectedItem.Text
+	}
+}
+
+func (widget *Widget) updateItem(text string) {
+	selectedItem := widget.list.Selected()
+
+	if selectedItem == nil {
+		// Create a new item
+		widget.list.Add(text)
+	} else {
+		// Update the text of the existing item
+		selectedItem.Text = text
+	}
+}
diff --git a/wtf.go b/wtf.go
index b5fe1702..d663b29d 100644
--- a/wtf.go
+++ b/wtf.go
@@ -195,7 +195,7 @@ func main() {
 		status.NewWidget(),
 		system.NewWidget(builtat, version),
 		textfile.NewWidget(),
-		todo.NewWidget(pages),
+		todo.NewWidget(app, pages),
 		weather.NewWidget(),
 	}