diff --git a/library/src/se/emilsjolander/stickylistheaders/StickyListHeadersListView.java b/library/src/se/emilsjolander/stickylistheaders/StickyListHeadersListView.java
index cc802e49..e34e2d4a 100644
--- a/library/src/se/emilsjolander/stickylistheaders/StickyListHeadersListView.java
+++ b/library/src/se/emilsjolander/stickylistheaders/StickyListHeadersListView.java
@@ -231,8 +231,9 @@ private void ensureHeaderHasCorrectLayoutParams(View header) {
         if (lp == null) {
             lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
             header.setLayoutParams(lp);
-        } else if (lp.height == LayoutParams.MATCH_PARENT) {
+        } else if (lp.height == LayoutParams.MATCH_PARENT || lp.width == LayoutParams.WRAP_CONTENT) {
             lp.height = LayoutParams.WRAP_CONTENT;
+            lp.width = LayoutParams.MATCH_PARENT;
             header.setLayoutParams(lp);
         }
     }