diff --git a/app.py b/app.py
index b96ddc4..a33d5a0 100644
--- a/app.py
+++ b/app.py
@@ -99,13 +99,23 @@ def calculate_statistics(user_input, current_text):
     # Dauer pro Zeichen (in Sekunden)
     duration_per_char = 1.0 / (typing_speed / 60) if typing_speed > 0 else 0
     
+    # Berechne Wörter pro Minute (WPM)
+    # Annahme: 1 Wort = 5 Zeichen (durchschnittlich)
+    words_per_minute = 0
+    if total_chars > 0 and duration_per_char > 0:
+        # Zeit in Minuten berechnen
+        time_in_minutes = (total_chars * duration_per_char) / 60
+        if time_in_minutes > 0:
+            words_per_minute = total_chars / 5 / time_in_minutes
+    
     return {
         'correct_chars': correct_chars,
         'incorrect_chars': incorrect_chars,
         'total_chars': total_chars,
         'error_rate': round(error_rate, 2),
         'typing_speed': typing_speed,
-        'duration_per_char': round(duration_per_char, 3)
+        'duration_per_char': round(duration_per_char, 3),
+        'words_per_minute': round(words_per_minute, 2)
     }
 
 @app.route('/next_text', methods=['POST'])
diff --git a/static/js/script.js b/static/js/script.js
index 97ec793..914dfb0 100644
--- a/static/js/script.js
+++ b/static/js/script.js
@@ -11,14 +11,39 @@ document.addEventListener('DOMContentLoaded', function() {
     const correctElement = document.getElementById('correct');
     const incorrectElement = document.getElementById('incorrect');
     const totalElement = document.getElementById('total');
+    const wpmElement = document.getElementById('wpm');
     
     // Aktuelle Textdaten
     let currentText = document.querySelector('#target-text').textContent;
     
+    // Fokus auf das Eingabefeld setzen
+    userInput.focus();
+    
     // Aktualisiere die Statistik bei Eingabe
     userInput.addEventListener('input', function() {
         const userValue = this.value;
         updateStatistics(userValue, currentText);
+        
+        // Wenn der Text vollständig getippt wurde, automatisch zur nächsten Zeile
+        if (userValue === currentText) {
+            setTimeout(function() {
+                fetch('/next_text', {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                    }
+                })
+                .then(response => response.json())
+                .then(data => {
+                    currentText = data.text;
+                    document.getElementById('target-text').textContent = currentText;
+                    userInput.value = '';
+                    userInput.focus(); // Fokus zurück auf Eingabefeld
+                    updateStatistics('', currentText);
+                })
+                .catch(error => console.error('Fehler:', error));
+            }, 100); // Kurze Verzögerung für bessere Benutzererfahrung
+        }
     });
     
     // Nächste Zeile Button
@@ -34,6 +59,7 @@ document.addEventListener('DOMContentLoaded', function() {
             currentText = data.text;
             document.getElementById('target-text').textContent = currentText;
             userInput.value = '';
+            userInput.focus(); // Fokus zurück auf Eingabefeld
             updateStatistics('', currentText);
         })
         .catch(error => console.error('Fehler:', error));
@@ -77,6 +103,7 @@ document.addEventListener('DOMContentLoaded', function() {
             correctElement.textContent = data.correct_chars;
             incorrectElement.textContent = data.incorrect_chars;
             totalElement.textContent = data.total_chars;
+            wpmElement.textContent = data.words_per_minute;
             
             // Aktualisiere die Textfarben
             updateTextHighlighting(userInput, currentText);
diff --git a/templates/index.html b/templates/index.html
index 27c5f48..5f76f90 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -55,6 +55,10 @@
                                                 Fehlerquote
                                                 <span id="error-rate" class="badge bg-danger rounded-pill">0%</span>
                                             </li>
+                                            <li class="list-group-item d-flex justify-content-between align-items-center">
+                                                Wörter pro Minute
+                                                <span id="wpm" class="badge bg-info rounded-pill">0</span>
+                                            </li>
                                         </ul>
                                     </div>
                                 </div>