diff --git a/src/bin/vrec-ui.rs b/src/bin/vrec-ui.rs
index eab6254..572b6ba 100644
--- a/src/bin/vrec-ui.rs
+++ b/src/bin/vrec-ui.rs
@@ -7,8 +7,9 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     if args.len() > 1 {
         match args[1].as_str() {
             "--save" => {
+                let res = send_command(Command::SaveReplay);
                 vrec::overlay::show_notification_overlay();
-                return send_command(Command::SaveReplay);
+                return res;
             }
             "--menu" => {
                 vrec::overlay::show_menu_overlay();
diff --git a/src/overlay.rs b/src/overlay.rs
index 22cd16e..6a56daf 100644
--- a/src/overlay.rs
+++ b/src/overlay.rs
@@ -6,6 +6,13 @@ use crate::config::VrecConfig;
 use crate::settings_ui;
 
 pub fn show_notification_overlay() {
+    if std::env::var("WAYLAND_DISPLAY").is_err() && std::env::var("DISPLAY").is_err() {
+        return;
+    }
+    if gtk::init().is_err() {
+        return;
+    }
+
     let app = Application::builder()
         .application_id("com.vrec.notification")
         .build();
@@ -58,6 +65,15 @@ pub fn show_notification_overlay() {
 }
 
 pub fn show_menu_overlay() {
+    if std::env::var("WAYLAND_DISPLAY").is_err() && std::env::var("DISPLAY").is_err() {
+        eprintln!("Error: No display server detected (WAYLAND_DISPLAY and DISPLAY are unset).");
+        return;
+    }
+    if gtk::init().is_err() {
+        eprintln!("Error: Failed to connect to display server.");
+        return;
+    }
+
     let app = Application::builder()
         .application_id("com.vrec.menu")
         .build();
diff --git a/tests/e2e_test.sh b/tests/e2e_test.sh
new file mode 100755
index 0000000..496a9ca
--- /dev/null
+++ b/tests/e2e_test.sh
@@ -0,0 +1,100 @@
+#!/usr/bin/env bash
+set -e
+
+echo "============================================="
+echo "   vrec Automated End-to-End Test Suite      "
+echo "============================================="
+
+# Ensure binaries are compiled
+echo "[1/6] Building release binaries..."
+cargo build --release --quiet
+
+SOCKET_PATH="${XDG_RUNTIME_DIR:-/tmp}/vrec.sock"
+rm -f "$SOCKET_PATH"
+rm -f test_record_*.mp4 test_replay_*.mp4
+
+echo "[2/6] Starting vrec-daemon with mock capture..."
+target/release/vrec-daemon --mock > daemon_test.log 2>&1 &
+DAEMON_PID=$!
+
+# Ensure daemon is killed on exit
+cleanup() {
+    if kill -0 $DAEMON_PID 2>/dev/null; then
+        target/release/vrec-ui --quit 2>/dev/null || kill -9 $DAEMON_PID 2>/dev/null || true
+    fi
+    rm -f daemon_test.log
+}
+trap cleanup EXIT
+
+# Wait for socket to become available
+echo "Waiting for daemon socket..."
+for i in {1..30}; do
+    if [ -S "$SOCKET_PATH" ]; then
+        break
+    fi
+    sleep 0.1
+done
+
+if [ ! -S "$SOCKET_PATH" ]; then
+    echo "ERROR: Daemon IPC socket was not created!"
+    cat daemon_test.log
+    exit 1
+fi
+echo "Daemon is live (PID: $DAEMON_PID, Socket: $SOCKET_PATH)"
+
+# Test 1: Start Normal Recording
+echo "[3/6] Testing: Start Normal Recording..."
+target/release/vrec-ui --start
+echo "Recording in progress for 3 seconds..."
+sleep 3
+
+# Test 2: Stop Normal Recording
+echo "[4/6] Testing: Stop Normal Recording..."
+target/release/vrec-ui --stop
+sleep 1
+
+# Test 3: Save Instant Replay
+echo "[5/6] Testing: Save Instant Replay buffer..."
+target/release/vrec-ui --save
+sleep 2
+
+# Test 4: Quit Daemon
+echo "[6/6] Testing: Clean Daemon Shutdown..."
+target/release/vrec-ui --quit
+wait $DAEMON_PID 2>/dev/null || true
+echo "Daemon shutdown cleanly."
+
+# Verify generated MP4 files with ffprobe
+echo "============================================="
+echo "   Verifying Generated Recordings with ffprobe"
+echo "============================================="
+
+MP4_FILES=(record_*.mp4 replay_*.mp4)
+FOUND_ANY=0
+
+for f in "${MP4_FILES[@]}"; do
+    if [ -f "$f" ]; then
+        FOUND_ANY=1
+        echo "--> Testing file: $f ($(ls -lh "$f" | awk '{print $5}'))"
+        
+        # Check container and stream information
+        PROBE_OUT=$(ffprobe -v error -show_entries format=duration,size,bit_rate:stream=codec_name,width,height,r_frame_rate -of default=noprint_wrappers=1 "$f")
+        echo "$PROBE_OUT"
+        
+        # Check for stream decode errors
+        ffmpeg -v error -i "$f" -f null - 2>&1
+        echo "File $f verified: VALID & NO CORRUPTION!"
+        echo "---------------------------------------------"
+        rm -f "$f"
+    fi
+done
+
+if [ $FOUND_ANY -eq 0 ]; then
+    echo "FAILED: No recording or replay files were produced!"
+    cat daemon_test.log
+    exit 1
+fi
+
+echo "============================================="
+echo "   ALL AUTOMATED TESTS PASSED SUCCESSFULLY!  "
+echo "============================================="