diff --git a/src/command/commands.c b/src/command/commands.c
index bbc06083..a5718eb8 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -857,7 +857,7 @@ cmd_wins(ProfWin *window, const char *const command, gchar **args)
     if (args[0] == NULL) {
         cons_show_wins();
     } else if (strcmp(args[0], "tidy") == 0) {
-        if (ui_tidy_wins()) {
+        if (wins_tidy()) {
             cons_show("Windows tidied.");
         } else {
             cons_show("No tidy needed.");
@@ -889,7 +889,7 @@ cmd_wins(ProfWin *window, const char *const command, gchar **args)
         if (g_strcmp0(args[1], "on") == 0) {
             cons_show("Window autotidy enabled");
             prefs_set_boolean(PREF_WINS_AUTO_TIDY, TRUE);
-            ui_tidy_wins();
+            wins_tidy();
         } else if (g_strcmp0(args[1], "off") == 0) {
             cons_show("Window autotidy disabled");
             prefs_set_boolean(PREF_WINS_AUTO_TIDY, FALSE);
@@ -3600,7 +3600,7 @@ cmd_close(ProfWin *window, const char *const command, gchar **args)
 
     // Tidy up the window list.
     if (prefs_get_boolean(PREF_WINS_AUTO_TIDY)) {
-        ui_tidy_wins();
+        wins_tidy();
     }
 
     return TRUE;
diff --git a/src/ui/core.c b/src/ui/core.c
index 09657238..74b6bbc1 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -712,12 +712,6 @@ ui_close_win(int index)
     status_bar_active(1);
 }
 
-gboolean
-ui_tidy_wins(void)
-{
-    return wins_tidy();
-}
-
 void
 ui_prune_wins(void)
 {
diff --git a/src/ui/ui.h b/src/ui/ui.h
index fd9072f3..0c4ee8eb 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -126,7 +126,6 @@ void ui_hide_all_room_rosters(void);
 void ui_handle_software_version_error(const char *const roomjid, const char *const message);
 void ui_show_software_version(const char *const jid, const char *const  presence, const char *const name,
     const char *const version, const char *const os);
-gboolean ui_tidy_wins(void);
 void ui_prune_wins(void);
 gboolean ui_swap_wins(int source_win, int target_win);
 void ui_clear_win(ProfWin *window);
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index 217f315f..bc1c08b4 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -279,9 +279,6 @@ void ui_redraw_all_room_rosters(void) {}
 void ui_show_all_room_rosters(void) {}
 void ui_hide_all_room_rosters(void) {}
 
-gboolean ui_tidy_wins(void) {
-    return TRUE;
-}
 void ui_prune_wins(void) {}
 gboolean ui_swap_wins(int source_win, int target_win)
 {