diff --git a/include/tig/display.h b/include/tig/display.h
index 63954b6a1..c9f6a236c 100644
--- a/include/tig/display.h
+++ b/include/tig/display.h
@@ -57,6 +57,7 @@ void open_editor(const char *file, unsigned int lineno);
 void enable_mouse(bool enable);
 
 enum status_code open_script(const char *path);
+bool is_script_executing(void);
 
 #define get_cursor_pos(cursor_y, cursor_x) getyx(newscr, cursor_y, cursor_x)
 #define set_cursor_pos(cursor_y, cursor_x) wmove(newscr, cursor_y, cursor_x)
diff --git a/src/display.c b/src/display.c
index 2b48498d3..43f642c59 100644
--- a/src/display.c
+++ b/src/display.c
@@ -34,7 +34,7 @@ static FILE *opt_tty;
 
 static struct io script_io = { -1 };
 
-static bool
+bool
 is_script_executing(void)
 {
 	return script_io.pipe != -1;
diff --git a/src/prompt.c b/src/prompt.c
index 2b1c063d1..b148be992 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -126,6 +126,20 @@ prompt_default_handler(struct input *input, struct key *key)
 	}
 }
 
+static enum input_status
+prompt_script_handler(struct input *input, struct key *key)
+{
+	switch (key_to_value(key)) {
+	case KEY_RETURN:
+	case KEY_ENTER:
+	case '\n':
+		return INPUT_STOP;
+
+	default:
+		return INPUT_OK;
+	}
+}
+
 static enum input_status
 prompt_yesno_handler(struct input *input, struct key *key)
 {
@@ -1078,10 +1092,15 @@ exec_run_request(struct view *view, struct run_request *req)
 enum request
 open_prompt(struct view *view)
 {
-	char *cmd = read_prompt(":");
+	char *cmd;
 	const char *argv[SIZEOF_ARG] = { NULL };
 	int argc = 0;
 
+	if (is_script_executing())
+		cmd = read_prompt_incremental(" ", false, true, prompt_script_handler, NULL);
+	else
+		cmd = read_prompt(":");
+
 	if (cmd && *cmd && !argv_from_string(argv, &argc, cmd)) {
 		report("Too many arguments");
 		return REQ_NONE;