diff --git a/src/IoTHub.Portal.Client/Components/Concentrators/ConcentratorSearch.razor b/src/IoTHub.Portal.Client/Components/Concentrators/ConcentratorSearch.razor
index c794db00b..16dadc519 100644
--- a/src/IoTHub.Portal.Client/Components/Concentrators/ConcentratorSearch.razor
+++ b/src/IoTHub.Portal.Client/Components/Concentrators/ConcentratorSearch.razor
@@ -1,36 +1,29 @@
-<MudExpansionPanels>
-    <MudExpansionPanel Text="Search panel">
-        <MudGrid>
-            <MudItem xs="12" md="6">
-                <MudTextField @bind-Value="searchKeyword" Placeholder="DeviceID / DeviceName" id="searchKeyword"></MudTextField>
-            </MudItem>
-            <MudGrid>
-                <MudItem sm="12" md="6">
-                    <MudText>Status</MudText>
-                    <MudRadioGroup @bind-SelectedOption="@searchStatus" Style="display:flex;align-items:baseline" id="searchStatus">
-                        <MudItem md="4" sm="12">
-                            <MudRadio Option=@("true") Color="Color.Primary" id="searchStatusEnabled">Enabled</MudRadio>
-                        </MudItem>
-                        <MudItem md="4" sm="12">
-                            <MudRadio Option=@("false") Color="Color.Primary" id="searchDisabled">Disabled</MudRadio>
-                        </MudItem>
-                        <MudItem md="4" sm="12">
-                            <MudRadio Option=@("") Color="Color.Secondary" id="searchStatusAll">All</MudRadio>
-                        </MudItem>
-                    </MudRadioGroup>
-
+<MudGrid>
+    <MudItem xs="12" md="6">
+        <MudTextField @bind-Value="searchKeyword" Placeholder="DeviceID / DeviceName" id="searchKeyword"></MudTextField>
+    </MudItem>
+    <MudGrid>
+        <MudItem sm="12" md="6">
+            <MudText>Status</MudText>
+            <MudRadioGroup @bind-SelectedOption="@searchStatus" Style="display:flex;align-items:baseline" id="searchStatus">
+                <MudItem md="4" sm="12">
+                    <MudRadio Option=@("true") Color="Color.Primary" id="searchStatusEnabled">Enabled</MudRadio>
                 </MudItem>
-            </MudGrid>
-
-            <MudItem xs="12">
-                <MudButton Variant="Variant.Outlined" Color="Color.Success" Style="margin:0.5em;" id="searchButton" OnClick=Search>Search</MudButton>
-                <MudButton Variant="Variant.Outlined" Color="Color.Primary" Style="margin:0.5em;" OnClick="Reset" id="resetSearch">Reset</MudButton>
-            </MudItem>
-
-        </MudGrid>
-
-    </MudExpansionPanel>
-</MudExpansionPanels>
+                <MudItem md="4" sm="12">
+                    <MudRadio Option=@("false") Color="Color.Primary" id="searchDisabled">Disabled</MudRadio>
+                </MudItem>
+                <MudItem md="4" sm="12">
+                    <MudRadio Option=@("") Color="Color.Secondary" id="searchStatusAll">All</MudRadio>
+                </MudItem>
+            </MudRadioGroup>
+        </MudItem>
+    </MudGrid>
+
+    <MudItem xs="12">
+        <MudButton Variant="Variant.Outlined" Color="Color.Success" Style="margin:0.5em;" id="searchButton" OnClick=Search>Search</MudButton>
+        <MudButton Variant="Variant.Outlined" Color="Color.Primary" Style="margin:0.5em;" OnClick="Reset" id="resetSearch">Reset</MudButton>
+    </MudItem>
+</MudGrid>
 
 @code {
     [Parameter]
diff --git a/src/IoTHub.Portal.Client/Components/DeviceModels/DeviceModelSearch.razor b/src/IoTHub.Portal.Client/Components/DeviceModels/DeviceModelSearch.razor
index 255ba1d97..ad66fa995 100644
--- a/src/IoTHub.Portal.Client/Components/DeviceModels/DeviceModelSearch.razor
+++ b/src/IoTHub.Portal.Client/Components/DeviceModels/DeviceModelSearch.razor
@@ -1,19 +1,13 @@
-<MudExpansionPanels>
-    <MudExpansionPanel Text="Search panel">
-        <MudGrid>
-            <MudItem xs="12" md="6">
-                <MudTextField @bind-Value="searchText" Placeholder="Device Model Name / Device Model Description" id="searchText"></MudTextField>
-            </MudItem>
-
-            <MudItem xs="12">
-                <MudButton Variant="Variant.Outlined" Color="Color.Success" Style="margin:0.5em;" id="searchButton" OnClick=Search>Search</MudButton>
-                <MudButton Variant="Variant.Outlined" Color="Color.Primary" Style="margin:0.5em;" OnClick="Reset" id="resetSearch">Reset</MudButton>
-            </MudItem>
-
-        </MudGrid>
-
-    </MudExpansionPanel>
-</MudExpansionPanels>
+<MudGrid>
+    <MudItem xs="12" md="6">
+        <MudTextField @bind-Value="searchText" Placeholder="Device Model Name / Device Model Description" id="searchText"></MudTextField>
+    </MudItem>
+
+    <MudItem xs="12">
+        <MudButton Variant="Variant.Outlined" Color="Color.Success" Style="margin:0.5em;" id="searchButton" OnClick=Search>Search</MudButton>
+        <MudButton Variant="Variant.Outlined" Color="Color.Primary" Style="margin:0.5em;" OnClick="Reset" id="resetSearch">Reset</MudButton>
+    </MudItem>
+</MudGrid>
 
 @code {
     [Parameter]
diff --git a/src/IoTHub.Portal.Client/Components/EdgeModels/EdgeModelSearch.razor b/src/IoTHub.Portal.Client/Components/EdgeModels/EdgeModelSearch.razor
index f6a35e137..491597628 100644
--- a/src/IoTHub.Portal.Client/Components/EdgeModels/EdgeModelSearch.razor
+++ b/src/IoTHub.Portal.Client/Components/EdgeModels/EdgeModelSearch.razor
@@ -1,18 +1,12 @@
-<MudExpansionPanels>
-    <MudExpansionPanel Text="Search panel">
-        <MudGrid>
-            <MudItem xs="12" md="6">
-                <MudTextField id="edge-model-search-keyword" @bind-Value="searchKeyword" Placeholder="Name / Description"></MudTextField>
-            </MudItem>
-            <MudItem xs="12">
-                <MudButton id="edge-model-search-button" Variant="Variant.Outlined" Color="Color.Success" Style="margin:0.5em;" OnClick=Search>Search</MudButton>
-                <MudButton id="edge-model-search-reset-button" Variant="Variant.Outlined" Color="Color.Primary" Style="margin:0.5em;" OnClick="Reset">Reset</MudButton>
-            </MudItem>
-
-        </MudGrid>
-
-    </MudExpansionPanel>
-</MudExpansionPanels>
+<MudGrid>
+    <MudItem xs="12" md="6">
+        <MudTextField id="edge-model-search-keyword" @bind-Value="searchKeyword" Placeholder="Name / Description"></MudTextField>
+    </MudItem>
+    <MudItem xs="12">
+        <MudButton id="edge-model-search-button" Variant="Variant.Outlined" Color="Color.Success" Style="margin:0.5em;" OnClick=Search>Search</MudButton>
+        <MudButton id="edge-model-search-reset-button" Variant="Variant.Outlined" Color="Color.Primary" Style="margin:0.5em;" OnClick="Reset">Reset</MudButton>
+    </MudItem>
+</MudGrid>
 
 @code {
     [Parameter]
diff --git a/src/IoTHub.Portal.Client/Pages/Devices/DeviceListPage.razor b/src/IoTHub.Portal.Client/Pages/Devices/DeviceListPage.razor
index abef6509a..e94a44764 100644
--- a/src/IoTHub.Portal.Client/Pages/Devices/DeviceListPage.razor
+++ b/src/IoTHub.Portal.Client/Pages/Devices/DeviceListPage.razor
@@ -15,85 +15,80 @@
 <AuthorizedContent IsLoading="@IsLoading" IsAuthorized="@IsAuthorized">
     <MudGrid>
         <MudItem xs="12">
-            <MudExpansionPanels>
-                <MudExpansionPanel Text="Search panel">
-                    <MudGrid>
+            <MudGrid>
+                <MudItem xs="12" md="6">
+                    <MudTextField @bind-Value="searchID" Placeholder="DeviceID / DeviceName" id="searchID"></MudTextField>
+                </MudItem>
+                @foreach (DeviceTagDto tag in TagList)
+                {
+                    if (tag.Searchable)
+                    {
                         <MudItem xs="12" md="6">
-                            <MudTextField @bind-Value="searchID" Placeholder="DeviceID / DeviceName" id="searchID"></MudTextField>
+                            <MudTextField @bind-Value="searchTags[tag.Name]" Placeholder="@tag.Label"></MudTextField>
                         </MudItem>
-                        @foreach (DeviceTagDto tag in TagList)
+                    }
+                }
+
+                <MudItem xs="12" md="6">
+                    <MudSelect T="LabelDto" Label="Labels" MultiSelection="true" @bind-SelectedValues="selectedLabels"
+                               MultiSelectionTextFunc="@(new Func<List<string>, string>(GetMultiSelectionText))"
+                               Variant="Variant.Outlined">
+                        @foreach (var label in labels)
                         {
-                            if (tag.Searchable)
-                            {
-                                <MudItem xs="12" md="6">
-                                    <MudTextField @bind-Value="searchTags[tag.Name]" Placeholder="@tag.Label"></MudTextField>
-                                </MudItem>
-                            }
+                            <MudSelectItem T="LabelDto" Value="@label">
+                                <MudChip Text="@label.Name" Color="Color.Primary" Style="@($"background-color: {label.Color};")" />
+                            </MudSelectItem>
                         }
-
-                        <MudItem xs="12" md="6">
-                            <MudSelect T="LabelDto" Label="Labels" MultiSelection="true" @bind-SelectedValues="selectedLabels"
-                                       MultiSelectionTextFunc="@(new Func<List<string>, string>(GetMultiSelectionText))"
-                                       Variant="Variant.Outlined">
-                                @foreach (var label in labels)
-                                {
-                                    <MudSelectItem T="LabelDto" Value="@label">
-                                        <MudChip Text="@label.Name" Color="Color.Primary" Style="@($"background-color: {label.Color};")" />
-                                    </MudSelectItem>
-                                }
-                            </MudSelect>
-                        </MudItem>
-
-                        <MudItem xs="12" md="6">
-                            <MudAutocomplete T="DeviceModelDto"
-                                             id="@nameof(DeviceModelDto.ModelId)"
-                                             @bind-Value="Model"
-                                             SearchFunc="@Search"
-                                             Label="Model"
-                                             Dense=true
-                                             For=@(() => this.Model)
-                                             Variant="Variant.Outlined"
-                                             ToStringFunc="@(x => x?.Name)"
-                                             ResetValueOnEmptyText=true
-                                             Immediate=true
-                                             Clearable=true
-                                             CoerceText=true
-                                             CoerceValue=false>
-                                <ItemTemplate>
-                                    @context.Name
-                                    <MudText Typo="Typo.subtitle1" Class="mud-input-helper-text">
-                                        @((!string.IsNullOrEmpty(@context.Description) && @context.Description.Length > 100) ? @context.Description.Substring(0, 100) + "..." : @context.Description)
-                                    </MudText>
-                                </ItemTemplate>
-                            </MudAutocomplete>
-                        </MudItem>
-                        <MudGrid>
-                            <MudItem sm="12" md="6">
-                                <MudText>Status</MudText>
-                                <MudRadioGroup @bind-SelectedOption="@searchStatus" Style="display:flex;align-items:baseline" id="searchStatus">
-                                    <MudItem md="4" sm="12">
-                                        <MudRadio Option=@("true") Color="Color.Primary" id="searchStatusEnabled">Enabled</MudRadio>
-                                    </MudItem>
-                                    <MudItem md="4" sm="12">
-                                        <MudRadio Option=@("false") Color="Color.Primary" id="searchDisabled">Disabled</MudRadio>
-                                    </MudItem>
-                                    <MudItem md="4" sm="12">
-                                        <MudRadio Option=@("") Color="Color.Secondary" id="searchStatusAll">All</MudRadio>
-                                    </MudItem>
-                                </MudRadioGroup>
-
+                    </MudSelect>
+                </MudItem>
+
+                <MudItem xs="12" md="6">
+                    <MudAutocomplete T="DeviceModelDto"
+                                     id="@nameof(DeviceModelDto.ModelId)"
+                                     @bind-Value="Model"
+                                     SearchFunc="@Search"
+                                     Label="Model"
+                                     Dense=true
+                                     For=@(() => this.Model)
+                                     Variant="Variant.Outlined"
+                                     ToStringFunc="@(x => x?.Name)"
+                                     ResetValueOnEmptyText=true
+                                     Immediate=true
+                                     Clearable=true
+                                     CoerceText=true
+                                     CoerceValue=false>
+                        <ItemTemplate>
+                            @context.Name
+                            <MudText Typo="Typo.subtitle1" Class="mud-input-helper-text">
+                                @((!string.IsNullOrEmpty(@context.Description) && @context.Description.Length > 100) ? @context.Description.Substring(0, 100) + "..." : @context.Description)
+                            </MudText>
+                        </ItemTemplate>
+                    </MudAutocomplete>
+                </MudItem>
+                <MudGrid>
+                    <MudItem sm="12" md="6">
+                        <MudText>Status</MudText>
+                        <MudRadioGroup @bind-SelectedOption="@searchStatus" Style="display:flex;align-items:baseline" id="searchStatus">
+                            <MudItem md="4" sm="12">
+                                <MudRadio Option=@("true") Color="Color.Primary" id="searchStatusEnabled">Enabled</MudRadio>
+                            </MudItem>
+                            <MudItem md="4" sm="12">
+                                <MudRadio Option=@("false") Color="Color.Primary" id="searchDisabled">Disabled</MudRadio>
                             </MudItem>
-                        </MudGrid>
+                            <MudItem md="4" sm="12">
+                                <MudRadio Option=@("") Color="Color.Secondary" id="searchStatusAll">All</MudRadio>
+                            </MudItem>
+                        </MudRadioGroup>
 
-                        <MudItem xs="12">
-                            <MudButton Variant="Variant.Outlined" Color="Color.Success" Style="margin:0.5em;" id="searchButton" OnClick=Search>Search</MudButton>
-                            <MudButton Variant="Variant.Outlined" Color="Color.Primary" Style="margin:0.5em;" OnClick="Reset" id="resetSearch">Reset</MudButton>
-                        </MudItem>
+                    </MudItem>
+                </MudGrid>
 
-                    </MudGrid>
+                <MudItem xs="12">
+                    <MudButton Variant="Variant.Outlined" Color="Color.Success" Style="margin:0.5em;" id="searchButton" OnClick=Search>Search</MudButton>
+                    <MudButton Variant="Variant.Outlined" Color="Color.Primary" Style="margin:0.5em;" OnClick="Reset" id="resetSearch">Reset</MudButton>
+                </MudItem>
 
-                </MudExpansionPanel>
-            </MudExpansionPanels>
+            </MudGrid>
         </MudItem>
         <MudItem xs="12">
             <MudTable T="DeviceListItem" ServerData=@LoadItems Dense=true Hover=true Bordered=true Striped=true @ref="table" Loading="@IsLoading" OnRowClick="@((e) => GoToDetails(e.Item))" RowStyle="cursor: pointer;">
diff --git a/src/IoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceListPage.razor b/src/IoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceListPage.razor
index 7294380cf..85cbeffd0 100644
--- a/src/IoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceListPage.razor
+++ b/src/IoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceListPage.razor
@@ -12,70 +12,66 @@
 <AuthorizedContent IsLoading="@IsLoading" IsAuthorized="@IsAuthorized">
     <MudGrid>
         <MudItem xs="12">
-            <MudExpansionPanels>
-                <MudExpansionPanel Text="Search panel">
-                    <MudGrid>
-                        <MudItem xs="12" md="6">
-                            <MudTextField @bind-Value="searchModel.DeviceId" Placeholder="Name"></MudTextField>
-                        </MudItem>
-
-                        <MudItem xs="12" md="6">
-                            <MudSelect T="LabelDto" Label="Labels" MultiSelection="true" @bind-SelectedValues="selectedLabels"
-                                       MultiSelectionTextFunc="@(new Func<List<string>, string>(GetMultiSelectionText))"
-                                       Variant="Variant.Outlined">
-                                @foreach (var label in labels)
-                                {
-                                    <MudSelectItem T="LabelDto" Value="@label">
-                                        <MudChip Text="@label.Name" Color="Color.Primary" Style="@($"background-color: {label.Color};")" />
-                                    </MudSelectItem>
-                                }
-                            </MudSelect>
-                        </MudItem>
-
-                        <MudItem xs="12" md="6">
-                            <MudAutocomplete T="IoTEdgeModelListItem"
-                                             id="@nameof(IoTEdgeModelListItem.ModelId)"
-                                             @bind-Value="edgeModel"
-                                             SearchFunc="@Search"
-                                             Label="Model"
-                                             Dense=true
-                                             For=@(() => this.edgeModel)
-                                             Variant="Variant.Outlined"
-                                             ToStringFunc="@(x => x?.Name)"
-                                             ResetValueOnEmptyText=true
-                                             Immediate=true
-                                             Clearable=true
-                                             CoerceText=true
-                                             CoerceValue=false>
-                                <ItemTemplate>
-                                    @context.Name
-                                    <MudText Typo="Typo.subtitle1" Class="mud-input-helper-text">
-                                        @((!string.IsNullOrEmpty(@context.Description) && @context.Description.Length > 100) ? @context.Description.Substring(0, 100) + "..." : @context.Description)
-                                    </MudText>
-                                </ItemTemplate>
-                            </MudAutocomplete>
+            <MudGrid>
+                <MudItem xs="12" md="6">
+                    <MudTextField @bind-Value="searchModel.DeviceId" Placeholder="Name"></MudTextField>
+                </MudItem>
+
+                <MudItem xs="12" md="6">
+                    <MudSelect T="LabelDto" Label="Labels" MultiSelection="true" @bind-SelectedValues="selectedLabels"
+                               MultiSelectionTextFunc="@(new Func<List<string>, string>(GetMultiSelectionText))"
+                               Variant="Variant.Outlined">
+                        @foreach (var label in labels)
+                        {
+                            <MudSelectItem T="LabelDto" Value="@label">
+                                <MudChip Text="@label.Name" Color="Color.Primary" Style="@($"background-color: {label.Color};")" />
+                            </MudSelectItem>
+                        }
+                    </MudSelect>
+                </MudItem>
+
+                <MudItem xs="12" md="6">
+                    <MudAutocomplete T="IoTEdgeModelListItem"
+                                     id="@nameof(IoTEdgeModelListItem.ModelId)"
+                                     @bind-Value="edgeModel"
+                                     SearchFunc="@Search"
+                                     Label="Model"
+                                     Dense=true
+                                     For=@(() => this.edgeModel)
+                                     Variant="Variant.Outlined"
+                                     ToStringFunc="@(x => x?.Name)"
+                                     ResetValueOnEmptyText=true
+                                     Immediate=true
+                                     Clearable=true
+                                     CoerceText=true
+                                     CoerceValue=false>
+                        <ItemTemplate>
+                            @context.Name
+                            <MudText Typo="Typo.subtitle1" Class="mud-input-helper-text">
+                                @((!string.IsNullOrEmpty(@context.Description) && @context.Description.Length > 100) ? @context.Description.Substring(0, 100) + "..." : @context.Description)
+                            </MudText>
+                        </ItemTemplate>
+                    </MudAutocomplete>
+                </MudItem>
+                <MudItem sm="12" md="6">
+                    <MudText>Status</MudText>
+                    <MudRadioGroup @bind-SelectedOption="@searchModel.Status" Style="display:flex;align-items:baseline">
+                        <MudItem md="4" sm="12">
+                            <MudRadio Option=@("true") Color="Color.Primary">Connected</MudRadio>
                         </MudItem>
-                        <MudItem sm="12" md="6">
-                            <MudText>Status</MudText>
-                            <MudRadioGroup @bind-SelectedOption="@searchModel.Status" Style="display:flex;align-items:baseline">
-                                <MudItem md="4" sm="12">
-                                    <MudRadio Option=@("true") Color="Color.Primary">Connected</MudRadio>
-                                </MudItem>
-                                <MudItem md="4" sm="12">
-                                    <MudRadio Option=@("false") Color="Color.Primary">Disconnected</MudRadio>
-                                </MudItem>
-                                <MudItem md="4" sm="12">
-                                    <MudRadio Option=@("true") Color="Color.Secondary">All</MudRadio>
-                                </MudItem>
-                            </MudRadioGroup>
+                        <MudItem md="4" sm="12">
+                            <MudRadio Option=@("false") Color="Color.Primary">Disconnected</MudRadio>
                         </MudItem>
-                        <MudItem xs="12" Class="pb-4 pl-4">
-                            <MudButton id="searchFilterButton" Variant="Variant.Outlined" Color="Color.Success" Class="ml-auto" OnClick="Search">Search</MudButton>
-                            <MudButton id="reset" Variant="Variant.Outlined" Color="Color.Primary" Class="ml-4" OnClick="ResetFilter">Reset</MudButton>
+                        <MudItem md="4" sm="12">
+                            <MudRadio Option=@("true") Color="Color.Secondary">All</MudRadio>
                         </MudItem>
-                    </MudGrid>
-                </MudExpansionPanel>
-            </MudExpansionPanels>
+                    </MudRadioGroup>
+                </MudItem>
+                <MudItem xs="12" Class="pb-4 pl-4">
+                    <MudButton id="searchFilterButton" Variant="Variant.Outlined" Color="Color.Success" Class="ml-auto" OnClick="Search">Search</MudButton>
+                    <MudButton id="reset" Variant="Variant.Outlined" Color="Color.Primary" Class="ml-4" OnClick="ResetFilter">Reset</MudButton>
+                </MudItem>
+            </MudGrid>
         </MudItem>
 
         <MudItem xs="12">
diff --git a/src/IoTHub.Portal.Tests.Unit/Client/Pages/Devices/DevicesListPageTests.cs b/src/IoTHub.Portal.Tests.Unit/Client/Pages/Devices/DevicesListPageTests.cs
index 25ff62c8c..35a0a36e5 100644
--- a/src/IoTHub.Portal.Tests.Unit/Client/Pages/Devices/DevicesListPageTests.cs
+++ b/src/IoTHub.Portal.Tests.Unit/Client/Pages/Devices/DevicesListPageTests.cs
@@ -61,8 +61,6 @@ public void DeviceListPageRendersCorrectly()
             cut.WaitForAssertion(() => cut.Markup.Should().NotContain("Loading..."));
 
             // Assert
-            cut.WaitForAssertion(() => cut.Find(".mud-expansion-panels .mud-expand-panel .mud-expand-panel-header .mud-expand-panel-text").TextContent.Should().Be("Search panel"));
-            cut.WaitForAssertion(() => cut.Find(".mud-expansion-panels .mud-expand-panel").ClassList.Should().NotContain("Search panel should be collapsed"));
             cut.WaitForAssertion(() => cut.FindAll("table tbody tr").Count.Should().Be(1));
             cut.WaitForAssertion(() => MockRepository.VerifyAll());
         }