diff --git a/Examples/test_script_mode_color.sh b/Examples/test_script_mode_color.sh
index 79b5ed15..23f5b2ff 100755
--- a/Examples/test_script_mode_color.sh
+++ b/Examples/test_script_mode_color.sh
@@ -10,7 +10,7 @@ then
     # Override the previously set prompt.
     echo -en "\0theme\x1felement-text { background-color: "$@";}\n"
     echo -en "\0keep-selection\x1ftrue\n"
-    echo -en "\0new-selection\x1f2\n"
+#    echo -en "\0new-selection\x1f2\n"
     echo "red"
     echo "lightgreen"
     echo "lightblue"
diff --git a/source/modes/script.c b/source/modes/script.c
index 3bce1a1d..df1dfc5d 100644
--- a/source/modes/script.c
+++ b/source/modes/script.c
@@ -352,7 +352,11 @@ static ModeMode script_mode_result(Mode *sw, int mretv, char **input,
           rmpd->new_selection < rmpd->cmd_list_length) {
         rofi_view_set_selected_line(rofi_view_get_active(),
                                     rmpd->new_selection);
+      } else {
+        rofi_view_set_selected_line(rofi_view_get_active(), selected_line);
       }
+      g_free(*input);
+      *input = NULL;
       retv = RELOAD_DIALOG;
     } else {
       retv = RESET_DIALOG;