diff --git a/Cargo.lock b/Cargo.lock
index e4cd8bd..d6100dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1302,9 +1302,9 @@ dependencies = [
 
 [[package]]
 name = "notify"
-version = "5.0.0-pre.12"
+version = "5.0.0-pre.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20a629259bb2c87a884bb76f6086c8637919de6d074754341c12e5dd3aed6326"
+checksum = "245d358380e2352c2d020e8ee62baac09b3420f1f6c012a31326cfced4ad487d"
 dependencies = [
  "bitflags",
  "crossbeam-channel",
diff --git a/Cargo.toml b/Cargo.toml
index f22e095..c3bfb81 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ egui_winit_platform = "0.10"
 wgpu = "0.10"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-notify = "5.0.0-pre.12"
+notify = "5.0.0-pre.13"
 env_logger = "0.9"
 egui_wgpu_backend = "0.12"
 
diff --git a/src/main.rs b/src/main.rs
index c41661e..5b0c14b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -37,14 +37,19 @@ async fn run(event_loop: EventLoop<()>, window: Rc<Window>) {
         .expect("creation of application failed");
 
     #[cfg(not(target_arch = "wasm32"))]
-    let (tx, rx) = channel::<notify::Result<notify::Event>>();
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        let watcher = start_watcher(tx);
-        if let Err(e) = watcher {
-            println!("Hot reloading disabled, watcher creation failed: {:?}", e);
+    let (rx, _watcher) = {
+        let (tx, rx) = channel::<notify::Result<notify::Event>>();
+        match start_watcher(tx) {
+            Ok(watcher) => {
+                println!("Watching shader main_view.wgsl for changes");
+                (rx, Some(watcher))
+            }
+            Err(e) => {
+                println!("Hot reloading disabled, watcher creation failed: {:?}", e);
+                (rx, None)
+            }
         }
-    }
+    };
 
     event_loop.run(move |event, _, control_flow| {
         app.handle_event(&event);
@@ -98,7 +103,7 @@ async fn run(event_loop: EventLoop<()>, window: Rc<Window>) {
                         let size = window.inner_size();
                         app.resize(size.width, size.height);
                     } else {
-                        panic!("SwapChainError: {}", e);
+                        panic!("{}", e);
                     }
                 }
             }