--- a/mobile/android/base/java/org/mozilla/gecko/home/BookmarksPanel.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/BookmarksPanel.java
@@ -67,16 +67,19 @@ public class BookmarksPanel extends Home
     private List<FolderInfo> mSavedParentStack;
 
     // Reference to the View to display when there are no results.
     private View mEmptyView;
 
     // Callback for cursor loaders.
     private CursorLoaderCallbacks mLoaderCallbacks;
 
+    // Keep track whether a fresh loader has been used or not.
+    private int mLastLoaderHash;
+
     @Override
     public void restoreData(@NonNull Bundle data) {
         final ArrayList<FolderInfo> stack = data.getParcelableArrayList("parentStack");
         if (stack == null) {
             return;
         }
 
         if (mListAdapter == null) {
@@ -313,18 +316,23 @@ public class BookmarksPanel extends Home
                 // is actually an unmodifiable wrapper around a LinkedList). We'll need to do a
                 // LinkedList conversion at the other end, when saving we need to use this awkward
                 // syntax to create an Array.
                 bundle.putParcelableArrayList("parentStack", new ArrayList<FolderInfo>(parentStack));
 
                 mPanelStateChangeListener.onStateChanged(bundle);
             }
 
-            if (mList != null) {
+            // BrowserDB updates (e.g. through sync, or when opening a new tab) will trigger
+            // a refresh which reuses the same loader - in that case we don't want to reset
+            // the scroll position again.
+            int currentLoaderHash = bl.hashCode();
+            if (mList != null && currentLoaderHash != mLastLoaderHash) {
                 mList.setSelection(bl.getTargetPosition());
+                mLastLoaderHash = currentLoaderHash;
             }
             updateUiFromCursor(c);
         }
 
         @Override
         public void onLoaderReset(Loader<Cursor> loader) {
             if (mList != null) {
                 mListAdapter.swapCursor(null);