diff --git a/library/src/se/emilsjolander/stickylistheaders/StickyListHeadersListView.java b/library/src/se/emilsjolander/stickylistheaders/StickyListHeadersListView.java
index ecccdc57..acb71a80 100644
--- a/library/src/se/emilsjolander/stickylistheaders/StickyListHeadersListView.java
+++ b/library/src/se/emilsjolander/stickylistheaders/StickyListHeadersListView.java
@@ -730,7 +730,7 @@ public void smoothScrollToPositionFromTop(int position, int offset,
 	}
 
 	public void setSelection(int position) {
-		mList.setSelection(position);
+		setSelectionFromTop(position, 0);
 	}
 
 	public void setSelectionAfterHeaderView() {
@@ -738,6 +738,7 @@ public void setSelectionAfterHeaderView() {
 	}
 
 	public void setSelectionFromTop(int position, int y) {
+		y += mAdapter == null ? 0 : getHeaderOverlap(position);
 		mList.setSelectionFromTop(position, y);
 	}