--- a/src/name/blackcap/clipman/SearchDialog.kt	Wed Jan 29 13:39:14 2020 -0800
+++ b/src/name/blackcap/clipman/SearchDialog.kt	Wed Jan 29 14:36:16 2020 -0800
@@ -163,8 +163,19 @@
         }
         if (result == null) {
             Toolkit.getDefaultToolkit().beep()
+            origin = null
+        } else {
+            origin = when(direction) {
+                PasteboardQueue.Direction.FORWARDS ->
+                    PasteboardQueue.Offset(result.inQueue, result.inItem + 1)
+                PasteboardQueue.Direction.BACKWARDS ->
+                    if (result.inItem == 0) {
+                        if (result.inQueue == 0) null else PasteboardQueue.Offset(result.inQueue - 1, -1)
+                    } else {
+                        PasteboardQueue.Offset(result.inQueue, result.inItem - 1)
+                    }
+            }
         }
-        origin = result
     }
 
     /* changing the search string resets the search origin */