diff --git a/ArduPlane/mode.h b/ArduPlane/mode.h
index 871bf5810c..0dafd9a0eb 100644
--- a/ArduPlane/mode.h
+++ b/ArduPlane/mode.h
@@ -173,9 +173,9 @@ public:
 
     bool allows_throttle_nudging() const override { return true; }
 
-    bool does_auto_navigation() const override { return true; }
+    bool does_auto_navigation() const override;
 
-    bool does_auto_throttle() const override { return true; }
+    bool does_auto_throttle() const override;
 
 protected:
 
diff --git a/ArduPlane/mode_auto.cpp b/ArduPlane/mode_auto.cpp
index 306f4dbc88..9b6332b059 100644
--- a/ArduPlane/mode_auto.cpp
+++ b/ArduPlane/mode_auto.cpp
@@ -112,3 +112,19 @@ void ModeAuto::navigate()
     }
 }
 
+
+bool ModeAuto::does_auto_navigation() const
+{
+#if AP_SCRIPTING_ENABLED
+   return (!plane.nav_scripting_active());
+#endif
+   return true;
+}
+
+bool ModeAuto::does_auto_throttle() const
+{
+#if AP_SCRIPTING_ENABLED
+   return (!plane.nav_scripting_active());
+#endif
+   return true;
+}