diff --git a/app/actions.py b/app/actions.py
index 2c1ec20a..142dd274 100644
--- a/app/actions.py
+++ b/app/actions.py
@@ -294,12 +294,19 @@ def bookmarkMove(self, upper, delta):
     # TODO(Androbin, aaxu): defer changes outside the screen
     for index in range(begin, len(self.bookmarks)):
       bookmark = self.bookmarks[index]
-      markRange = bookmark[0]
+      markRange, data = bookmark
+
       if markRange[0] > upper:
         markRange = (markRange[0] + delta, markRange[1] + delta)
       elif markRange[1] >= upper:
         markRange = (markRange[0], markRange[1] + delta)
-      bookmark = (markRange, bookmark[1])
+
+      for key in ['cursor', 'marker', 'pen']
+        value = data[key]
+        if value[0] >= upper:
+          data[key] = (value[0] + delta, value[1])
+
+      bookmark = (markRange, data)
       self.bookmarks[index] = bookmark
 
   def backspace(self):