diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c
index d69a671e7b5..ff262b1a581 100644
--- a/source/blender/python/BPY_interface.c
+++ b/source/blender/python/BPY_interface.c
@@ -1247,9 +1247,9 @@ int BPY_do_spacehandlers( ScrArea *sa, unsigned short event,
 {
 	ScriptLink *scriptlink;
 	int retval = 0;
-
-	if (!sa) return 0;
-
+	
+	if (!sa || !(G.f & G_DOSCRIPTLINKS)) return 0;
+	
 	scriptlink = &sa->scriptlink;
 
 	if (scriptlink->totscript > 0) {
diff --git a/source/blender/src/buttons_script.c b/source/blender/src/buttons_script.c
index f56b56d0965..a30163b4da3 100644
--- a/source/blender/src/buttons_script.c
+++ b/source/blender/src/buttons_script.c
@@ -322,7 +322,7 @@ static void  script_panel_scriptlink(void)
 
 	uiDefButBitI(block, TOG, G_DOSCRIPTLINKS, REDRAWBUTSSCRIPT,
 			"Enable Script Links", xco, 200, 150, 20, &G.f, 0, 0, 0, 0,
-			"Enable execution of all assigned Script links");
+			"Enable execution of all assigned Script links amd Space Handelers");
 	/* for proper alignment: */
 	uiDefBut(block, LABEL, 0, "",	160, 200,150,20, NULL, 0.0, 0.0, 0, 0, "");