diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index c2dbae298..f674098af 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -2900,30 +2900,6 @@ gui_buffer_search_by_number_or_name (const char *string)
     return ptr_buffer;
 }
 
-/*
- * Searches for a buffer by layout number.
- */
-
-struct t_gui_buffer *
-gui_buffer_search_by_layout_number (int layout_number,
-                                    int layout_number_merge_order)
-{
-    struct t_gui_buffer *ptr_buffer;
-
-    for (ptr_buffer = gui_buffers; ptr_buffer;
-         ptr_buffer = ptr_buffer->next_buffer)
-    {
-        if ((ptr_buffer->layout_number == layout_number)
-            && (ptr_buffer->layout_number_merge_order == layout_number_merge_order))
-        {
-            return ptr_buffer;
-        }
-    }
-
-    /* buffer not found */
-    return NULL;
-}
-
 /*
  * Searches a range of buffer between "number1" and  "number2" (both are
  * included in the range).
diff --git a/src/gui/gui-buffer.h b/src/gui/gui-buffer.h
index abf381276..dad3569d1 100644
--- a/src/gui/gui-buffer.h
+++ b/src/gui/gui-buffer.h
@@ -346,8 +346,6 @@ extern struct t_gui_buffer *gui_buffer_search_by_partial_name (const char *plugi
                                                                const char *name);
 extern struct t_gui_buffer *gui_buffer_search_by_number (int number);
 extern struct t_gui_buffer *gui_buffer_search_by_number_or_name (const char *string);
-extern struct t_gui_buffer *gui_buffer_search_by_layout_number (int layout_number,
-                                                                int layout_number_merge_order);
 extern int gui_buffer_count_merged_buffers (int number);
 extern int gui_buffer_is_scrolled (struct t_gui_buffer *buffer);
 extern void gui_buffer_clear (struct t_gui_buffer *buffer);
diff --git a/tests/unit/gui/test-gui-buffer.cpp b/tests/unit/gui/test-gui-buffer.cpp
index 3e9b64418..8c7e7a35f 100644
--- a/tests/unit/gui/test-gui-buffer.cpp
+++ b/tests/unit/gui/test-gui-buffer.cpp
@@ -1037,16 +1037,6 @@ TEST(GuiBuffer, SearchByNumberOrName)
     /* TODO: write tests */
 }
 
-/*
- * Tests functions:
- *   gui_buffer_search_by_layout_number
- */
-
-TEST(GuiBuffer, SearchByLayoutNumber)
-{
-    /* TODO: write tests */
-}
-
 /*
  * Tests functions:
  *   gui_buffer_search_range