diff --git a/imgui.cpp b/imgui.cpp
index 2e76a8e92..3a43223e1 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -15713,12 +15713,14 @@ void ImGui::CleanupIniSettings(ImGuiSettingsCleanupArgs* args)
     ImGuiContext& g = *GImGui;
     if (g.PlatformIO.Platform_SessionDate == 0)
         return;
+    ImGuiID type_hash_filter = args->TypeName ? ImHashStr(args->TypeName) : 0;
     ImGuiPackedDate discard_older_than_date_p = g.PlatformIO.Platform_SessionDate;
     discard_older_than_date_p.SubtractMonths(args->DiscardOlderThanMonths);
     args->_DiscardOlderThanDate = discard_older_than_date_p.Unpack();
     for (ImGuiSettingsHandler& handler : g.SettingsHandlers)
-        if (handler.CleanupFn != NULL)
-            handler.CleanupFn(&g, &handler, args);
+        if (type_hash_filter == 0 || handler.TypeHash == type_hash_filter)
+            if (handler.CleanupFn != NULL)
+                handler.CleanupFn(&g, &handler, args);
 }
 
 void ImGui::LoadIniSettingsFromDisk(const char* ini_filename)
diff --git a/imgui_internal.h b/imgui_internal.h
index c9ee4cbba..33f3ad756 100644
--- a/imgui_internal.h
+++ b/imgui_internal.h
@@ -2048,6 +2048,7 @@ struct ImGuiWindowSettings
 
 struct ImGuiSettingsCleanupArgs
 {
+    const char*     TypeName = NULL;                                // Set to restrict cleanup to a given .ini type, e.g. "Window", "Table". Otherwise every types supporting Cleanup are supported.
     int             DiscardOlderThanMonths = 0;                     // Enable to discard entries older than XX months.
     bool            DiscardWhenMissingDate = false;                 // Enable to discard entries missing a date.
     bool            SetCurrentSessionDateToAll = false;             // Enable to write current SessionDate to all supporting entries. // Let us know in #9460 if you use this.