diff --git a/src/scriptfile.c b/src/scriptfile.c
index cee3f5440..3b9fec1cd 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -1658,10 +1658,13 @@ ex_scriptnames(exarg_T *eap)
 		    i,
 		    si->sn_state == SN_STATE_NOT_LOADED ? " A" : "",
 		    NameBuff);
-	    msg_putchar('\n');
-	    msg_outtrans(IObuff);
-	    out_flush();	    // output one line at a time
-	    ui_breakcheck();
+	    if (!message_filtered(IObuff))
+	    {
+		msg_putchar('\n');
+		msg_outtrans(IObuff);
+		out_flush();	    // output one line at a time
+		ui_breakcheck();
+	    }
 	}
     }
 }
diff --git a/src/testdir/test_filter_cmd.vim b/src/testdir/test_filter_cmd.vim
index 1a9ae7b5b..7c84a1384 100644
--- a/src/testdir/test_filter_cmd.vim
+++ b/src/testdir/test_filter_cmd.vim
@@ -190,4 +190,10 @@ func Test_filter_display()
   bwipe!
 endfunc
 
+func Test_filter_scriptnames()
+  let lines = split(execute('filter /test_filter_cmd/ scriptnames'), "\n")
+  call assert_equal(1, len(lines))
+  call assert_match('filter_cmd', lines[0])
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index ab53d5120..824f17264 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4336,
 /**/
     4335,
 /**/