diff --git a/inventory/views.py b/inventory/views.py
index 587340f0..2b342975 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -1886,7 +1886,7 @@ class CustomerListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
     model = models.Customer
     home_label = _("customers")
     context_object_name = "customers"
-    paginate_by = 1
+    paginate_by = 30
     template_name = "customers/customer_list.html"
     ordering = ["-created"]
     permission_required = ["django_ledger.view_customermodel"]
@@ -3738,11 +3738,11 @@ def create_estimate(request, pk=None):
             }
         )
 
-    # form = forms.EstimateModelCreateForm(
-    #     entity_slug=entity.slug, user_model=entity.admin
-    # )
     form = forms.EstimateModelCreateForm()
-    form.fields["customer"].queryset = dealer.customers.filter(active=True)
+    form.fields['customer'].queryset = models.Customer.objects.filter(
+        dealer=dealer,
+        active=True
+    )
 
     if pk:
         opportunity = models.Opportunity.objects.get(pk=pk)