diff --git a/main.go b/main.go
index f45cd0f..f928882 100644
--- a/main.go
+++ b/main.go
@@ -236,7 +236,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				})
 			}
 		} else if m.searchMode {
-			if key.Matches(msg, keySearch) {
+			if key.Matches(msg, keySearch, keyQuit) {
 				m.searchMode = false
 				return m, nil
 			} else if key.Matches(msg, keyBack) {
@@ -573,7 +573,7 @@ func (m *model) View() string {
 		// TODO: Show most recent status bar.
 		if len(m.toBeDeleted) > 0 {
 			toDelete := m.toBeDeleted[len(m.toBeDeleted)-1]
-			timeLeft := int(toDelete.at.Sub(time.Now()).Seconds())
+			timeLeft := int(time.Until(toDelete.at).Seconds())
 			deleteBar := fmt.Sprintf("%v deleted. (u)ndo %v", path.Base(toDelete.path), timeLeft)
 			main += "\n" + danger.Render(deleteBar)
 		} else if m.yankedFilePath != "" {