diff --git a/internal/handlers/customers.go b/internal/handlers/customers.go
index 15ccf50..98e890a 100644
--- a/internal/handlers/customers.go
+++ b/internal/handlers/customers.go
@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"fmt"
 	"net/http"
 	"strconv"
 
@@ -39,6 +40,13 @@ func (h *Handler) CustomerList(w http.ResponseWriter, r *http.Request) {
 
 	// HTMX partial for search
 	if r.Header.Get("HX-Request") == "true" && r.URL.Query().Get("partial") == "true" {
+		// Construct clean URL for history
+		u := fmt.Sprintf("/customers?page=%d", page)
+		if search != "" {
+			u += "&search=" + search
+		}
+		w.Header().Set("HX-Push-Url", u)
+
 		h.renderPartial(w, "customers/list.html", "customer-table", data)
 		return
 	}
diff --git a/templates/customers/list.html b/templates/customers/list.html
index 13268d1..d32403a 100644
--- a/templates/customers/list.html
+++ b/templates/customers/list.html
@@ -72,7 +72,8 @@
             <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
                 {{if .HasPrev}}
                 <button 
-                    hx-get="/customers?page={{.PrevPage}}&search={{.Search}}&partial=true" 
+                    hx-get="/customers?page={{.PrevPage}}{{if .Search}}&search={{.Search}}{{end}}&partial=true" 
+                    hx-push-url="/customers?page={{.PrevPage}}{{if .Search}}&search={{.Search}}{{end}}"
                     hx-target="#customer-table"
                     class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0">
                     <span class="sr-only">Previous</span>
@@ -83,7 +84,8 @@
                 {{end}}
                 {{if .HasNext}}
                 <button 
-                    hx-get="/customers?page={{.NextPage}}&search={{.Search}}&partial=true" 
+                    hx-get="/customers?page={{.NextPage}}{{if .Search}}&search={{.Search}}{{end}}&partial=true" 
+                    hx-push-url="/customers?page={{.NextPage}}{{if .Search}}&search={{.Search}}{{end}}"
                     hx-target="#customer-table"
                     class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0">
                     <span class="sr-only">Next</span>
diff --git a/templates/invoices/list.html b/templates/invoices/list.html
index b34599d..4a3ad08 100644
--- a/templates/invoices/list.html
+++ b/templates/invoices/list.html
@@ -76,7 +76,8 @@
             <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
                 {{if .HasPrev}}
                 <button 
-                    hx-get="/invoices?page={{.PrevPage}}&status={{.FilterStatus}}&partial=true" 
+                    hx-get="/invoices?page={{.PrevPage}}{{if .FilterStatus}}&status={{.FilterStatus}}{{end}}&partial=true" 
+                    hx-push-url="/invoices?page={{.PrevPage}}{{if .FilterStatus}}&status={{.FilterStatus}}{{end}}"
                     hx-target="#invoice-table"
                     class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0">
                     <span class="sr-only">Previous</span>
@@ -87,7 +88,8 @@
                 {{end}}
                 {{if .HasNext}}
                 <button 
-                    hx-get="/invoices?page={{.NextPage}}&status={{.FilterStatus}}&partial=true" 
+                    hx-get="/invoices?page={{.NextPage}}{{if .FilterStatus}}&status={{.FilterStatus}}{{end}}&partial=true" 
+                    hx-push-url="/invoices?page={{.NextPage}}{{if .FilterStatus}}&status={{.FilterStatus}}{{end}}"
                     hx-target="#invoice-table"
                     class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0">
                     <span class="sr-only">Next</span>
diff --git a/templates/orders/list.html b/templates/orders/list.html
index 9df9b82..52514bb 100644
--- a/templates/orders/list.html
+++ b/templates/orders/list.html
@@ -78,7 +78,8 @@
             <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
                 {{if .HasPrev}}
                 <button 
-                    hx-get="/orders?page={{.PrevPage}}&status={{.FilterStatus}}&partial=true" 
+                    hx-get="/orders?page={{.PrevPage}}{{if .FilterStatus}}&status={{.FilterStatus}}{{end}}&partial=true" 
+                    hx-push-url="/orders?page={{.PrevPage}}{{if .FilterStatus}}&status={{.FilterStatus}}{{end}}"
                     hx-target="#order-table"
                     class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0">
                     <span class="sr-only">Previous</span>
@@ -89,7 +90,8 @@
                 {{end}}
                 {{if .HasNext}}
                 <button 
-                    hx-get="/orders?page={{.NextPage}}&status={{.FilterStatus}}&partial=true" 
+                    hx-get="/orders?page={{.NextPage}}{{if .FilterStatus}}&status={{.FilterStatus}}{{end}}&partial=true" 
+                    hx-push-url="/orders?page={{.NextPage}}{{if .FilterStatus}}&status={{.FilterStatus}}{{end}}"
                     hx-target="#order-table"
                     class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0">
                     <span class="sr-only">Next</span>