diff --git a/components/invoices/InvoiceEditor.tsx b/components/invoices/InvoiceEditor.tsx
index a69cfed8..b5754501 100644
--- a/components/invoices/InvoiceEditor.tsx
+++ b/components/invoices/InvoiceEditor.tsx
@@ -1960,6 +1960,13 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
                     <SelectValue placeholder={t('select_customer_placeholder')} />
                   </SelectTrigger>
                   <SelectContent>
+                    {/* Radix renders an empty viewport as a bare few-pixel
+                        sliver; give the zero-customer state real content. */}
+                    {customers.length === 0 && (
+                      <div className="px-3 py-2 text-[13px] text-muted-foreground">
+                        {t('no_customers_yet')}
+                      </div>
+                    )}
                     {customers.map((customer) => (
                       <SelectItem key={customer.id} value={customer.id}>
                         {customer.name}
@@ -2608,7 +2615,12 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
                   </div>
                   <div
                     id={`${entryListId}-hint`}
-                    className="border-t border-border px-3 py-2 text-[11px] text-muted-foreground"
+                    className={cn(
+                      'px-3 py-2 text-[11px] text-muted-foreground',
+                      // Border only when a list renders above; alone it reads
+                      // as a stray hairline at the top of the popover.
+                      entryMatches.length > 0 && 'border-t border-border',
+                    )}
                   >
                     {entryMatches.length > 0 ? t('entry_hint_matches') : t('entry_hint_free')}
                   </div>
diff --git a/components/supplier-invoices/NewSupplierInvoiceForm.tsx b/components/supplier-invoices/NewSupplierInvoiceForm.tsx
index f4c0c074..61ff9172 100644
--- a/components/supplier-invoices/NewSupplierInvoiceForm.tsx
+++ b/components/supplier-invoices/NewSupplierInvoiceForm.tsx
@@ -1677,6 +1677,11 @@ export default function NewSupplierInvoiceForm({
                   e.preventDefault()
                 }}
               >
+                {suppliers.length === 0 && (
+                  <div className="px-2 py-2 text-[13px] text-muted-foreground">
+                    {t('no_suppliers_yet')}
+                  </div>
+                )}
                 {suppliers.map((s) => (
                   <DropdownMenuItem
                     key={s.id}
@@ -1695,7 +1700,8 @@ export default function NewSupplierInvoiceForm({
                     </div>
                   </DropdownMenuItem>
                 ))}
-                <DropdownMenuSeparator />
+                {/* No separator over an empty list: it reads as a stray line. */}
+                {suppliers.length > 0 && <DropdownMenuSeparator />}
                 <DropdownMenuItem onSelect={openSupplierDialogBlank} className="text-muted-foreground">
                   {t('add_new_supplier')}
                 </DropdownMenuItem>
diff --git a/messages/en.json b/messages/en.json
index d354b03c..7dd7674c 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -3487,6 +3487,7 @@
     "bank_add_now": "Add now",
     "customer_card_title": "Customer",
     "select_customer_placeholder": "Select customer",
+    "no_customers_yet": "No customers yet",
     "create_customer": "Create customer",
     "create_customer_dialog_title": "Add customer",
     "create_customer_failed_title": "Could not create customer",
@@ -4250,6 +4251,7 @@
     "paid_privately_help_ef": "Booked as a liability from the company to you (2018 Egen insättning). Refund manually later from the company account.",
     "paid_privately_help_ab": "Booked as a liability from the company to you (2893 Skuld till ägare). Refund manually later from the company account.",
     "supplier_placeholder": "Select supplier",
+    "no_suppliers_yet": "No suppliers yet",
     "add_new_supplier": "+ Add new supplier...",
     "supplier_invoice_number_label": "Supplier's invoice number",
     "supplier_invoice_number_placeholder": "Invoice no. from supplier",
diff --git a/messages/sv.json b/messages/sv.json
index 1d804821..e3a91a51 100644
--- a/messages/sv.json
+++ b/messages/sv.json
@@ -3487,6 +3487,7 @@
     "bank_add_now": "Lägg till nu",
     "customer_card_title": "Kund",
     "select_customer_placeholder": "Välj kund",
+    "no_customers_yet": "Inga kunder än",
     "create_customer": "Skapa kund",
     "create_customer_dialog_title": "Lägg till kund",
     "create_customer_failed_title": "Kunde inte skapa kund",
@@ -4250,6 +4251,7 @@
     "paid_privately_help_ef": "Bokförs som skuld från bolaget till dig (2018 Egen insättning). Återbetalas senare manuellt från företagskontot.",
     "paid_privately_help_ab": "Bokförs som skuld från bolaget till dig (2893 Skuld till ägare). Återbetalas senare manuellt från företagskontot.",
     "supplier_placeholder": "Välj leverantör",
+    "no_suppliers_yet": "Inga leverantörer än",
     "add_new_supplier": "+ Lägg till ny leverantör...",
     "supplier_invoice_number_label": "Leverantörens fakturanummer",
     "supplier_invoice_number_placeholder": "Fakturanr från leverantören",