diff --git a/src/d_main.h b/src/d_main.h
index 5ede9469..97863fb2 100644
--- a/src/d_main.h
+++ b/src/d_main.h
@@ -59,6 +59,8 @@ void D_PageDrawer(void);
 void D_AdvanceDemo(void);
 void D_StartTitle(void);
 
+extern boolean advancedemo;
+
 #endif
 
 //----------------------------------------------------------------------------
diff --git a/src/d_net.c b/src/d_net.c
index 4ca9cde3..607a7151 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -18,6 +18,7 @@
 //
 
 #include "d_loop.h"
+#include "d_main.h"
 #include "d_player.h"
 #include "d_ticcmd.h"
 #include "doomdef.h"
@@ -67,7 +68,6 @@ void D_DoAdvanceDemo(void);
 
 void RunTic(ticcmd_t *cmds, boolean *ingame)
 {
-    extern boolean advancedemo;
     unsigned int i;
 
     // Check for player quits.
diff --git a/src/i_video.c b/src/i_video.c
index 6fc4b742..2f78992c 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -169,7 +169,7 @@ static boolean MouseShouldBeGrabbed(void)
 
     // only grab mouse when playing levels (but not demos)
     return (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION)
-           && !demoplayback;
+           && !demoplayback && !advancedemo;
 }
 
 // [FG] mouse grabbing from Chocolate Doom 3.0