diff --git a/source/_docs/organizing/filtering.markdown b/source/_docs/organizing/filtering.markdown
index 1777bfe05e8..302777a52ad 100644
--- a/source/_docs/organizing/filtering.markdown
+++ b/source/_docs/organizing/filtering.markdown
@@ -9,14 +9,41 @@ When working with tables, you can select multiple elements to apply an action on
 
 1. In your table, select the select the <img height="28px" src="/images/organizing/multiselect_icon.png" alt="Multiselect icon"/> button.
 
-  ![Screenshots point out the enable selection mode button in the toolbar of the tables in Home Assistant](/images/blog/2024-04/enable-selection-mode.png)
+   ![Screenshots point out the enable selection mode button in the toolbar of the tables in Home Assistant](/images/blog/2024-04/enable-selection-mode.png)
+
 2. In the list, select the items of interest.
 
    ![Selecting multiple elements in a list](/images/organizing/multiselect_01.png)
 
+## Filtering items in a table
+
+You can filter a table so that only items matching certain criteria are shown.
+
+1. In the top left corner above the table, select the **Filters** button.
+
+    ![Select the filter button](/images/organizing/filters_01.png)
+
+2. In the filters panel, select your filter criteria.
+   - You can filter for [floors](/docs/organizing/floors/), [areas](/docs/organizing/areas/), [labels](/docs/organizing/labels/) and [categories](/docs/organizing/categories/) if you have previously defined them.
+
+    ![Screenshots showing the filter panel that tables can have, allowing you to easily find what you are looking for](/images/organizing/filter-panel.png)
+
+## Grouping and sorting items in a table
+
+You can group items in a table according to certain criteria. The number of shown items stays the same. No items will be hidden.
+
+1. In the top right above the table, select the **Group by** button.
+2. The items will be grouped according to the criteria you chose.
+   - In the example, the items are grouped by manufacturer.
+
+    ![Select the Group by button](/images/organizing/table_group_01.png)
+
+3. To sort the items, select the **Sort by** button.
+
 ## Related topics
 
 - [Floors](/docs/organzing/floors/)
 - [Labels](/docs/organzing/labels/)
 - [Areas](/docs/organzing/areas/)
-- [Directories](/docs/organzing/directories/)
\ No newline at end of file
+- [Categories](/docs/organzing/categories/)
+- [Grouping your assets](/docs/organizing/)
\ No newline at end of file
diff --git a/source/_includes/asides/organizing_navigation.html b/source/_includes/asides/organizing_navigation.html
index 1b6b2225de3..f79d52561c4 100644
--- a/source/_includes/asides/organizing_navigation.html
+++ b/source/_includes/asides/organizing_navigation.html
@@ -4,7 +4,7 @@
     <h1 class="title delta">Organizing</h1>
     <ul class="divided sidebar-menu">
       <li>{% active_link /docs/organizing/ Grouping your assets %}</li>
-      <li>{% active_link /docs/organizing/filtering Filtering your assets %}</li>
+      <li>{% active_link /docs/organizing/filtering Filtering, grouping, sorting %}</li>
       <li>
         {% active_link /docs/organizing/areas/ Areas %}
       </li>
diff --git a/source/images/organizing/filter-panel.png b/source/images/organizing/filter-panel.png
new file mode 100644
index 00000000000..67e69d67d94
Binary files /dev/null and b/source/images/organizing/filter-panel.png differ
diff --git a/source/images/organizing/table_group_01.png b/source/images/organizing/table_group_01.png
new file mode 100644
index 00000000000..616be9ccd41
Binary files /dev/null and b/source/images/organizing/table_group_01.png differ