diff --git a/core/config.class.inc.php b/core/config.class.inc.php
index 10657edbc..3b2902042 100644
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -1229,6 +1229,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+		'activity_panel.prefilter_only_current_log' => [
+			'type' => 'bool',
+			'description' => 'Whether the "Logs" filter should only be set to the log from the current tab or to all of them.',
+			'default' => true,
+			'value' => true,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
 		'activity_panel.show_author_name_below_entries' => [
 			'type' => 'bool',
 			'description' => 'Whether or not to show the author friendlyname next to the date on the last entry.',
diff --git a/templates/base/layouts/activity-panel/tab-toolbar/layout.html.twig b/templates/base/layouts/activity-panel/tab-toolbar/layout.html.twig
index 3955b8d75..540eca170 100644
--- a/templates/base/layouts/activity-panel/tab-toolbar/layout.html.twig
+++ b/templates/base/layouts/activity-panel/tab-toolbar/layout.html.twig
@@ -26,7 +26,7 @@
                         <label class="ibo-activity-panel--tab-toolbar-action" data-role="ibo-activity-panel--tab-toolbar-action"
                                data-tooltip-content="{{ 'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Tooltip'|dict_s }}">
                             <input type="checkbox" name="caselogs" data-role="ibo-activity-panel--filter" data-target-entry-types="caselog"
-                                   {% if (aFilteredCaseLogsAttCodes is not defined) or (aFilteredCaseLogsAttCodes is empty) %}checked{% endif %}>
+                                   {% if (aFilteredCaseLogsAttCodes is not defined) or (aFilteredCaseLogsAttCodes is empty) or (get_config_parameter('activity_panel.prefilter_only_current_log') == false) %}checked{% endif %}>
                             {{ 'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Title'|dict_s }}
                             {% if oUIBlock.GetCaseLogTabs()|length > 0 %}
                                 <a class="ibo-activity-panel--filter-options-toggler ibo-is-closed"
@@ -40,7 +40,7 @@
                                             <input type="checkbox" name="caselog" value="{{ sCaseLogAttCode }}"
                                                    class="ibo-activity-panel--filter-option-input"
                                                    data-role="ibo-activity-panel--filter-option-input"
-                                                   {% if (aFilteredCaseLogsAttCodes is not defined) or (sCaseLogAttCode in aFilteredCaseLogsAttCodes) %}checked{% endif %}>
+                                                   {% if (aFilteredCaseLogsAttCodes is not defined) or (sCaseLogAttCode in aFilteredCaseLogsAttCodes) or (get_config_parameter('activity_panel.prefilter_only_current_log') == false) %}checked{% endif %}>
                                             {{ aCaseLogData['title'] }}
                                         </label>
                                     {% endfor %}