diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index e671278b8..800c7980f 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -1624,6 +1624,22 @@ gui_buffer_set_day_change (struct t_gui_buffer *buffer, int day_change)
     gui_buffer_ask_chat_refresh (buffer, 2);
 }
 
+/*
+ * Sets filter for a buffer.
+ */
+
+void
+gui_buffer_set_filter (struct t_gui_buffer *buffer, int filter)
+{
+    filter = (filter) ? 1 : 0;
+
+    if (!buffer || (buffer->filter == filter))
+        return;
+
+    buffer->filter = filter;
+    gui_filter_buffer (buffer, NULL);
+}
+
 /*
  * Sets name for a buffer.
  */
@@ -2573,10 +2589,7 @@ gui_buffer_set (struct t_gui_buffer *buffer, const char *property,
         error = NULL;
         number = strtol (value, &error, 10);
         if (error && !error[0])
-        {
-            buffer->filter = (number) ? 1 : 0;
-            gui_filter_buffer (buffer, NULL);
-        }
+            gui_buffer_set_filter (buffer, number);
     }
     else if (strcmp (property, "number") == 0)
     {
diff --git a/tests/unit/gui/test-gui-buffer.cpp b/tests/unit/gui/test-gui-buffer.cpp
index a03b95dd8..1391b82c4 100644
--- a/tests/unit/gui/test-gui-buffer.cpp
+++ b/tests/unit/gui/test-gui-buffer.cpp
@@ -981,6 +981,16 @@ TEST(GuiBuffer, SetDayChange)
     /* TODO: write tests */
 }
 
+/*
+ * Tests functions:
+ *   gui_buffer_set_filter
+ */
+
+TEST(GuiBuffer, SetFilter)
+{
+    /* TODO: write tests */
+}
+
 /*
  * Tests functions:
  *   gui_buffer_set_name