diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig
index e68095221f..728ef0fc42 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig
@@ -408,6 +408,7 @@
 			registerFilterListeners();
 
 			// Open first level if only one item
+			// TODO: We must disable opening of first level when pre-filtering when filtering will be implemented
 			if($('#brick_content_mosaic > .mosaic-group[data-level-id="L"] > .mosaic-group-item').length == 1)
 			{
 			    setTimeout(function(){
diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_tree.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_tree.html.twig
index 7f7c8ce07a..5a95ef27d4 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_tree.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_tree.html.twig
@@ -411,8 +411,8 @@
 			registerFilterListeners();
 			collapseAll();
 
-            // Open first level if only one item
-            if($('#brick_content_tree > .list-group-item').length == 1)
+            // Open first level if only one item and not pre-filtering
+            if( ($('#brick_content_tree > .list-group-item').length == 1) && ($('#brick_search_field').val() === '') )
             {
                 setTimeout(function(){
                     $('#brick_content_tree > .list-group-item > .tree-toggle').trigger('click');