diff --git a/src/App.tsx b/src/App.tsx
index d958b85..deb5867 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -306,6 +306,13 @@ function App() {
     return getFretboardPositions(targetMidi, currentTuning);
   }, [settings.showHint, targetMidi, currentTuning, currentInstrumentDef]);
 
+  // Auto-enable mic when tuner is turned on
+  useEffect(() => {
+    if (settings.showTuningMeter && !listening) {
+      setListening(true);
+    }
+  }, [settings.showTuningMeter, listening]);
+
   return (
     <div className={`app-container ${settings.zenMode ? 'zen-mode' : ''}`}>
       {!settings.zenMode && (
@@ -423,22 +430,18 @@ function App() {
                 {listening ? <Mic size={28} /> : <MicOff size={28} />}
               </button>
 
-              {settings.showTuningMeter && pitchData ? (
-                <TuningMeter cents={pitchData.cents} noteName={pitchData.note} />
-              ) : (
-                <div className={`pitch-readout ${pitchData ? 'active' : ''}`}>
-                  {pitchData ? (
-                    <>
-                      <span className={`detected-note ${pitchData.midi === targetMidi ? 'match' : ''}`}>
-                        {pitchData.note}
-                      </span>
-                      <span className="detected-hz">{Math.round(pitchData.frequency)} Hz</span>
-                    </>
-                  ) : (
-                    <span className="placeholder">{listening ? "Listening..." : "Mic Off"}</span>
-                  )}
-                </div>
-              )}
+              <div className={`pitch-readout ${pitchData ? 'active' : ''}`}>
+                {pitchData ? (
+                  <>
+                    <span className={`detected-note ${pitchData.midi === targetMidi ? 'match' : ''}`}>
+                      {pitchData.note}
+                    </span>
+                    <span className="detected-hz">{Math.round(pitchData.frequency)} Hz</span>
+                  </>
+                ) : (
+                  <span className="placeholder">{listening ? "Listening..." : "Mic Off"}</span>
+                )}
+              </div>
             </div>
           )
         }
@@ -446,13 +449,17 @@ function App() {
 
       {!settings.zenMode && (
         <footer className="settings-footer">
-          <Controls settings={settings} onUpdateSettings={setSettings} />
+          <Controls
+            settings={settings}
+            onUpdateSettings={setSettings}
+            currentPitch={pitchData ? { note: pitchData.note, cents: pitchData.cents } : null}
+          />
           <div className="app-subtitle">
             <a href="http://jensmohrmann.de" target="_blank" rel="noopener noreferrer">jensmohrmann.de</a>
           </div>
         </footer>
-      )
-      }
+      )}
+
 
       {/* Floating Zen Mode Button (Toggle) */}
       <button
@@ -464,39 +471,41 @@ function App() {
       </button>
 
       {/* Help Popup */}
-      {showHelp && (
-        <div className="help-popup-overlay" onClick={() => setShowHelp(false)}>
-          <div className="help-popup" onClick={e => e.stopPropagation()}>
-            <button className="help-close" onClick={() => setShowHelp(false)}><X size={20} /></button>
-            <h2 style={{ marginTop: 0, marginBottom: '24px' }}>Keyboard Shortcuts</h2>
+      {
+        showHelp && (
+          <div className="help-popup-overlay" onClick={() => setShowHelp(false)}>
+            <div className="help-popup" onClick={e => e.stopPropagation()}>
+              <button className="help-close" onClick={() => setShowHelp(false)}><X size={20} /></button>
+              <h2 style={{ marginTop: 0, marginBottom: '24px' }}>Keyboard Shortcuts</h2>
 
-            <div className="help-item">
-              <span>Skip Note</span>
-              <span className="shortcut-key">Space</span>
-            </div>
-            <div className="help-item">
-              <span>Toggle Hint</span>
-              <span className="shortcut-key">H</span>
-            </div>
-            <div className="help-item">
-              <span>Toggle Zen Mode</span>
-              <span className="shortcut-key">Z</span>
-            </div>
-            <div className="help-item">
-              <span>Replay Note</span>
-              <span className="shortcut-key">R</span>
-            </div>
-            <div className="help-item">
-              <span>Toggle Game Mode</span>
-              <span className="shortcut-key">M</span>
-            </div>
-            <div className="help-item">
-              <span>Close Help / Exit Zen</span>
-              <span className="shortcut-key">Esc</span>
+              <div className="help-item">
+                <span>Skip Note</span>
+                <span className="shortcut-key">Space</span>
+              </div>
+              <div className="help-item">
+                <span>Toggle Hint</span>
+                <span className="shortcut-key">H</span>
+              </div>
+              <div className="help-item">
+                <span>Toggle Zen Mode</span>
+                <span className="shortcut-key">Z</span>
+              </div>
+              <div className="help-item">
+                <span>Replay Note</span>
+                <span className="shortcut-key">R</span>
+              </div>
+              <div className="help-item">
+                <span>Toggle Game Mode</span>
+                <span className="shortcut-key">M</span>
+              </div>
+              <div className="help-item">
+                <span>Close Help / Exit Zen</span>
+                <span className="shortcut-key">Esc</span>
+              </div>
             </div>
           </div>
-        </div>
-      )}
+        )
+      }
     </div >
   );
 }
diff --git a/src/components/Controls.tsx b/src/components/Controls.tsx
index 679edf6..192532f 100644
--- a/src/components/Controls.tsx
+++ b/src/components/Controls.tsx
@@ -2,6 +2,7 @@ import { Settings, Guitar, Music, Gauge } from 'lucide-react';
 import { TUNINGS, INSTRUMENT_TUNINGS } from '../music/Tunings';
 import { INSTRUMENT_DEFINITIONS } from '../music/InstrumentConfigs';
 import { getTempoMarking } from '../music/TempoMarkings';
+import { TuningMeter } from './TuningMeter';
 
 export type Difficulty = string;
 
@@ -33,9 +34,10 @@ export interface AppSettings {
 interface ControlsProps {
     settings: AppSettings;
     onUpdateSettings: (s: AppSettings) => void;
+    currentPitch: { note: string; cents: number } | null;
 }
 
-export const Controls: React.FC<ControlsProps> = ({ settings, onUpdateSettings }) => {
+export const Controls: React.FC<ControlsProps> = ({ settings, onUpdateSettings, currentPitch }) => {
     const handleDifficultyChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
         onUpdateSettings({ ...settings, difficulty: e.target.value as Difficulty });
     };
@@ -223,6 +225,16 @@ export const Controls: React.FC<ControlsProps> = ({ settings, onUpdateSettings }
                             <div className="switch-thumb" />
                         </button>
                     </div>
+                    {settings.showTuningMeter && currentPitch && (
+                        <div style={{ paddingTop: '8px', borderTop: '1px solid rgba(255,255,255,0.1)' }}>
+                            <TuningMeter cents={currentPitch.cents} noteName={currentPitch.note} />
+                        </div>
+                    )}
+                    {settings.showTuningMeter && !currentPitch && (
+                        <div style={{ paddingTop: '8px', borderTop: '1px solid rgba(255,255,255,0.1)', fontSize: '11px', opacity: 0.5, textAlign: 'center' }}>
+                            Listening...
+                        </div>
+                    )}
                 </div>
 
                 {/* Tool 2: Metronome */}