diff --git a/fcore/search-list.sml b/fcore/search-list.sml
index a615553..914d55d 100644
--- a/fcore/search-list.sml
+++ b/fcore/search-list.sml
@@ -57,13 +57,12 @@ struct
   fun build (buffer, searchString) =
     if String.size searchString > 0 then
       let
-        val buffer = LineGap.goToEnd buffer
         val searchList = search (buffer, searchString)
       in
-        (buffer, searchList)
+        searchList
       end
     else
-      (buffer, empty)
+      empty
 
   fun loopNextMatch (pos, searchList, count) =
     if count = 0 then
diff --git a/shell/search-thread.sml b/shell/search-thread.sml
index 1abd7a3..595bb9a 100644
--- a/shell/search-thread.sml
+++ b/shell/search-thread.sml
@@ -6,7 +6,7 @@ struct
   fun loop (searchMailbox, inputMailbox) =
     let
       val (buffer, searchString) = Mailbox.recv searchMailbox
-      val (_, searchList) = SearchList.build (buffer, searchString)
+      val searchList = SearchList.build (buffer, searchString)
       val () = Mailbox.send (inputMailbox, InputMsg.WITH_SEARCH_LIST searchList)
     in
       loop (searchMailbox, inputMailbox)