diff --git a/frontend/src/pages/SettingsPage.jsx b/frontend/src/pages/SettingsPage.jsx
index 79289ba..ec72f4c 100644
--- a/frontend/src/pages/SettingsPage.jsx
+++ b/frontend/src/pages/SettingsPage.jsx
@@ -347,61 +347,86 @@ function APIKeysSection() {
         </div>
       )}
 
-      {/* Key Liste */}
+      {/* Key Liste — gruppiert nach Kunde */}
       {loading ? (
         <div className="px-4 py-3 text-gray-500 text-xs">Laden...</div>
       ) : keys.length === 0 ? (
         <div className="px-4 py-4 text-center text-gray-500 text-xs">Keine API-Keys vorhanden</div>
-      ) : (
-        <div className="divide-y divide-gray-800/60">
-          {keys.map((k) => {
-            const perm = PERM_LABELS[k.permissions] || PERM_LABELS.read
-            const customer = k.customer_id ? customers.find(c => c.id === k.customer_id) : null
-            const lastUsedAgo = k.last_used
-              ? (() => {
-                  const s = (Date.now() - new Date(k.last_used)) / 1000
-                  if (s < 120) return 'gerade eben'
-                  if (s < 3600) return `${Math.floor(s/60)}m`
-                  if (s < 86400) return `${Math.floor(s/3600)}h`
-                  return `${Math.floor(s/86400)}d`
-                })()
-              : null
-            return (
-              <div key={k.id} className="px-4 py-1.5 flex items-center gap-2.5 hover:bg-gray-800/30 group">
-                <span className={`text-[10px] font-bold px-1.5 py-0.5 rounded border leading-none w-16 text-center flex-shrink-0 ${perm.color}`}>
-                  {perm.label}
-                </span>
-                <span className="text-xs text-gray-300 flex-1 min-w-0 truncate">{k.name}</span>
-                {customer && (
-                  <span className="text-[10px] text-gray-600 flex-shrink-0 hidden sm:block">{customer.number}</span>
-                )}
-                <code className="text-xs text-gray-600 font-mono flex-shrink-0">
-                  {k.key.substring(0, 8)}…{k.key.substring(k.key.length - 4)}
-                </code>
-                {lastUsedAgo && (
-                  <span className="text-[10px] text-gray-700 flex-shrink-0 hidden md:block" title={`Zuletzt benutzt: ${new Date(k.last_used).toLocaleString('de-DE')}`}>
-                    {lastUsedAgo}
-                  </span>
-                )}
-                <button
-                  onClick={() => copyText(k.key, k.id)}
-                  className="text-gray-600 hover:text-orange-400 transition-colors flex-shrink-0 opacity-0 group-hover:opacity-100"
-                  title="Key kopieren"
-                >
-                  {copied === k.id ? <Check className="w-3.5 h-3.5 text-green-400" /> : <Copy className="w-3.5 h-3.5" />}
-                </button>
-                <button
-                  onClick={() => handleDelete(k.id, k.name)}
-                  className="text-gray-700 hover:text-red-400 transition-colors flex-shrink-0 opacity-0 group-hover:opacity-100"
-                  title="Key loeschen"
-                >
-                  <Trash2 className="w-3.5 h-3.5" />
-                </button>
-              </div>
-            )
-          })}
-        </div>
-      )}
+      ) : (() => {
+          // Gruppen bauen: null-Kunde zuerst, dann nach Kundennummer sortiert
+          const groups = {}
+          keys.forEach(k => {
+            const gid = k.customer_id ?? '__global__'
+            if (!groups[gid]) groups[gid] = []
+            groups[gid].push(k)
+          })
+          const sorted = Object.entries(groups).sort(([a], [b]) => {
+            if (a === '__global__') return -1
+            if (b === '__global__') return 1
+            const ca = customers.find(c => c.id === parseInt(a))
+            const cb = customers.find(c => c.id === parseInt(b))
+            return (ca?.number || '').localeCompare(cb?.number || '')
+          })
+          return (
+            <div className="divide-y divide-gray-800">
+              {sorted.map(([gid, gkeys]) => {
+                const customer = gid !== '__global__' ? customers.find(c => c.id === parseInt(gid)) : null
+                return (
+                  <div key={gid}>
+                    {/* Gruppen-Header */}
+                    <div className="px-4 py-1.5 bg-gray-800/40 flex items-center gap-2">
+                      <span className="text-[10px] font-semibold text-gray-500 uppercase tracking-wide">
+                        {customer ? `${customer.number} — ${customer.name}` : 'Global'}
+                      </span>
+                      <span className="text-[10px] text-gray-700">({gkeys.length})</span>
+                    </div>
+                    {/* Keys der Gruppe */}
+                    {gkeys.map(k => {
+                      const perm = PERM_LABELS[k.permissions] || PERM_LABELS.read
+                      const lastUsedAgo = k.last_used
+                        ? (() => {
+                            const s = (Date.now() - new Date(k.last_used)) / 1000
+                            if (s < 120) return 'gerade eben'
+                            if (s < 3600) return `${Math.floor(s/60)}m`
+                            if (s < 86400) return `${Math.floor(s/3600)}h`
+                            return `${Math.floor(s/86400)}d`
+                          })()
+                        : null
+                      return (
+                        <div key={k.id} className="px-4 py-1.5 flex items-center gap-2.5 hover:bg-gray-800/30 group">
+                          <span className={`text-[10px] font-bold px-1.5 py-0.5 rounded border leading-none w-16 text-center flex-shrink-0 ${perm.color}`}>
+                            {perm.label}
+                          </span>
+                          <span className="text-xs text-gray-300 flex-1 min-w-0 truncate">{k.name}</span>
+                          <code className="text-xs text-gray-600 font-mono flex-shrink-0">
+                            {k.key.substring(0, 8)}…{k.key.substring(k.key.length - 4)}
+                          </code>
+                          {lastUsedAgo && (
+                            <span className="text-[10px] text-gray-700 flex-shrink-0 hidden md:block"
+                              title={`Zuletzt: ${new Date(k.last_used).toLocaleString('de-DE')}`}>
+                              {lastUsedAgo}
+                            </span>
+                          )}
+                          <button onClick={() => copyText(k.key, k.id)}
+                            className="text-gray-600 hover:text-orange-400 transition-colors flex-shrink-0 opacity-0 group-hover:opacity-100"
+                            title="Key kopieren">
+                            {copied === k.id ? <Check className="w-3.5 h-3.5 text-green-400" /> : <Copy className="w-3.5 h-3.5" />}
+                          </button>
+                          <button onClick={() => handleDelete(k.id, k.name)}
+                            className="text-gray-700 hover:text-red-400 transition-colors flex-shrink-0 opacity-0 group-hover:opacity-100"
+                            title="Key loeschen">
+                            <Trash2 className="w-3.5 h-3.5" />
+                          </button>
+                        </div>
+                      )
+                    })}
+                  </div>
+                )
+              })}
+            </div>
+          )
+        })()
+      }
     </div>
   )
 }