diff --git a/frontend/src/pages/AdminActivityMappingsPage.jsx b/frontend/src/pages/AdminActivityMappingsPage.jsx
index c1a5c7b..ebf8414 100644
--- a/frontend/src/pages/AdminActivityMappingsPage.jsx
+++ b/frontend/src/pages/AdminActivityMappingsPage.jsx
@@ -195,22 +195,18 @@ export default function AdminActivityMappingsPage() {
       </div>
 
       {/* Create new button */}
-      {!editingId && (
-        <button
-          onClick={startCreate}
-          className="btn btn-primary btn-full"
-          style={{ marginBottom: 16 }}
-        >
-          <Plus size={16} /> Neues Mapping anlegen
-        </button>
-      )}
+      <button
+        onClick={startCreate}
+        className="btn btn-primary btn-full"
+        style={{ marginBottom: 16 }}
+      >
+        <Plus size={16} /> Neues Mapping anlegen
+      </button>
 
-      {/* Edit form */}
-      {editingId && formData && (
-        <div className="card" style={{ padding: 16, marginBottom: 16 }}>
-          <div style={{ fontWeight: 600, marginBottom: 12 }}>
-            {editingId === 'new' ? '➕ Neues Mapping' : '✏️ Mapping bearbeiten'}
-          </div>
+      {/* New mapping form (only shown when creating) */}
+      {editingId === 'new' && formData && (
+        <div className="card" style={{ padding: 16, marginBottom: 16, border: '2px solid var(--accent)' }}>
+          <div style={{ fontWeight: 600, marginBottom: 12 }}>➕ Neues Mapping</div>
 
           <div style={{ display: 'flex', flexDirection: 'column', gap: 16 }}>
             <div>
@@ -220,8 +216,8 @@ export default function AdminActivityMappingsPage() {
                 value={formData.activity_type}
                 onChange={e => setFormData({ ...formData, activity_type: e.target.value })}
                 placeholder="z.B. Traditionelles Krafttraining"
-                disabled={editingId !== 'new'}
                 style={{ width: '100%' }}
+                autoFocus
               />
               <div style={{ fontSize: 11, color: 'var(--text3)', marginTop: 4 }}>
                 Groß-/Kleinschreibung beachten! Muss exakt mit CSV übereinstimmen.
@@ -289,65 +285,149 @@ export default function AdminActivityMappingsPage() {
         </div>
       )}
 
-      {/* List */}
+      {/* List with inline editing */}
       {mappings.length === 0 ? (
         <div className="card" style={{ padding: 40, textAlign: 'center', color: 'var(--text3)' }}>
           Keine Mappings gefunden
         </div>
       ) : (
         <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
-          {mappings.map(mapping => (
-            <div
-              key={mapping.id}
-              className="card"
-              style={{ padding: 12 }}
-            >
-              <div style={{
-                display: 'flex',
-                alignItems: 'center',
-                gap: 8
-              }}>
-                <div style={{ fontSize: 18 }}>{mapping.icon}</div>
-                <div style={{ flex: 1 }}>
-                  <div style={{ fontSize: 13, fontWeight: 600 }}>
-                    {mapping.activity_type}
+          {mappings.map(mapping => {
+            const isEditing = editingId === mapping.id
+
+            return (
+              <div
+                key={mapping.id}
+                className="card"
+                style={{
+                  padding: 12,
+                  border: isEditing ? '2px solid var(--accent)' : undefined
+                }}
+              >
+                {isEditing && formData ? (
+                  /* Inline edit form */
+                  <div>
+                    <div style={{ fontWeight: 600, marginBottom: 12, color: 'var(--accent)' }}>
+                      ✏️ Mapping bearbeiten
+                    </div>
+
+                    <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
+                      <div>
+                        <div className="form-label">Activity Type (nicht änderbar)</div>
+                        <input
+                          className="form-input"
+                          value={formData.activity_type}
+                          disabled
+                          style={{ width: '100%', background: 'var(--surface2)' }}
+                        />
+                      </div>
+
+                      <div>
+                        <div className="form-label">Training Type *</div>
+                        <select
+                          className="form-input"
+                          value={formData.training_type_id}
+                          onChange={e => setFormData({ ...formData, training_type_id: parseInt(e.target.value) })}
+                          style={{ width: '100%' }}
+                        >
+                          {trainingTypes.map(type => (
+                            <option key={type.id} value={type.id}>
+                              {type.icon} {type.name_de} ({type.category})
+                            </option>
+                          ))}
+                        </select>
+                      </div>
+
+                      <div>
+                        <div className="form-label">Profil-ID (leer = global)</div>
+                        <input
+                          className="form-input"
+                          value={formData.profile_id}
+                          onChange={e => setFormData({ ...formData, profile_id: e.target.value })}
+                          placeholder="Leer lassen für globales Mapping"
+                          style={{ width: '100%' }}
+                        />
+                      </div>
+
+                      <div style={{ display: 'flex', gap: 8, marginTop: 8 }}>
+                        <button
+                          onClick={handleSave}
+                          disabled={saving}
+                          className="btn btn-primary"
+                          style={{ flex: 1 }}
+                        >
+                          {saving ? (
+                            <div style={{ display: 'flex', alignItems: 'center', gap: 6, justifyContent: 'center' }}>
+                              <div className="spinner" style={{ width: 14, height: 14 }} />
+                              Speichere...
+                            </div>
+                          ) : (
+                            <>
+                              <Save size={16} /> Speichern
+                            </>
+                          )}
+                        </button>
+                        <button
+                          onClick={cancelEdit}
+                          disabled={saving}
+                          className="btn btn-secondary"
+                          style={{ flex: 1 }}
+                        >
+                          <X size={16} /> Abbrechen
+                        </button>
+                      </div>
+                    </div>
                   </div>
-                  <div style={{ fontSize: 11, color: 'var(--text3)' }}>
-                    → {mapping.training_type_name_de}
-                    {mapping.profile_id && <> · User-spezifisch</>}
-                    {!mapping.profile_id && <> · Global</>}
-                    {mapping.source && <> · {mapping.source}</>}
+                ) : (
+                  /* Normal view */
+                  <div style={{
+                    display: 'flex',
+                    alignItems: 'center',
+                    gap: 8
+                  }}>
+                    <div style={{ fontSize: 18 }}>{mapping.icon}</div>
+                    <div style={{ flex: 1 }}>
+                      <div style={{ fontSize: 13, fontWeight: 600 }}>
+                        {mapping.activity_type}
+                      </div>
+                      <div style={{ fontSize: 11, color: 'var(--text3)' }}>
+                        → {mapping.training_type_name_de}
+                        {mapping.profile_id && <> · User-spezifisch</>}
+                        {!mapping.profile_id && <> · Global</>}
+                        {mapping.source && <> · {mapping.source}</>}
+                      </div>
+                    </div>
+                    <button
+                      onClick={() => startEdit(mapping)}
+                      style={{
+                        background: 'none',
+                        border: 'none',
+                        cursor: 'pointer',
+                        padding: 6,
+                        color: 'var(--accent)'
+                      }}
+                      title="Bearbeiten"
+                    >
+                      <Pencil size={16} />
+                    </button>
+                    <button
+                      onClick={() => handleDelete(mapping.id, mapping.activity_type)}
+                      style={{
+                        background: 'none',
+                        border: 'none',
+                        cursor: 'pointer',
+                        padding: 6,
+                        color: '#D85A30'
+                      }}
+                      title="Löschen"
+                    >
+                      <Trash2 size={16} />
+                    </button>
                   </div>
-                </div>
-                <button
-                  onClick={() => startEdit(mapping)}
-                  style={{
-                    background: 'none',
-                    border: 'none',
-                    cursor: 'pointer',
-                    padding: 6,
-                    color: 'var(--accent)'
-                  }}
-                  title="Bearbeiten"
-                >
-                  <Pencil size={16} />
-                </button>
-                <button
-                  onClick={() => handleDelete(mapping.id, mapping.activity_type)}
-                  style={{
-                    background: 'none',
-                    border: 'none',
-                    cursor: 'pointer',
-                    padding: 6,
-                    color: '#D85A30'
-                  }}
-                  title="Löschen"
-                >
-                  <Trash2 size={16} />
-                </button>
+                )}
               </div>
-            </div>
-          ))}
+            )
+          })}
         </div>
       )}