diff --git a/callbacks.c b/callbacks.c
index 1212b1d..b9dca4b 100644
--- a/callbacks.c
+++ b/callbacks.c
@@ -274,10 +274,7 @@ cb_index_row_activated(GtkTreeView* tree_view, GtkTreePath* path,
     }
 
     sc_toggle_index(zathura->ui.session, NULL, NULL, 0);
-
-    /* zathura_jumplist_save is called when entering index mode */
     zathura_link_evaluate(zathura, index_element->link);
-    zathura_jumplist_add(zathura);
   }
 
   g_object_unref(model);
@@ -333,9 +330,7 @@ handle_link(GtkEntry* entry, girara_session_t* session,
         invalid_index = false;
         switch (action) {
           case ZATHURA_LINK_ACTION_FOLLOW:
-            zathura_jumplist_add(zathura);
             zathura_link_evaluate(zathura, link);
-            zathura_jumplist_add(zathura);
             break;
           case ZATHURA_LINK_ACTION_DISPLAY:
             zathura_link_display(zathura, link);
diff --git a/links.c b/links.c
index 968b983..dc5a837 100644
--- a/links.c
+++ b/links.c
@@ -149,6 +149,8 @@ zathura_link_evaluate(zathura_t* zathura, zathura_link_t* link)
           }
         }
 
+        zathura_jumplist_add(zathura);
+
         /* jump to the page */
         page_set(zathura, link->target.page_number);
 
@@ -161,6 +163,8 @@ zathura_link_evaluate(zathura_t* zathura, zathura_link_t* link)
         } else {
           position_set(zathura, -1, offset.y);
         }
+
+        zathura_jumplist_add(zathura);
       }
       break;
     case ZATHURA_LINK_GOTO_REMOTE: