diff --git a/client/src/components/History/Index.vue b/client/src/components/History/Index.vue
index f9dd21480e75..f058ae1cb4ea 100644
--- a/client/src/components/History/Index.vue
+++ b/client/src/components/History/Index.vue
@@ -1,5 +1,8 @@
 <template>
-    <div v-if="currentUser && currentHistory" id="current-history-panel" class="d-flex flex-column history-index">
+    <div
+        v-if="currentUser && currentHistory"
+        id="current-history-panel"
+        class="d-flex flex-column history-index overflow-auto">
         <HistoryPanel
             v-if="!breadcrumbs.length"
             :list-offset="listOffset"
diff --git a/client/src/components/Panels/Menus/PanelViewMenu.vue b/client/src/components/Panels/Menus/PanelViewMenu.vue
index b6afe4a69006..135abdde4e90 100644
--- a/client/src/components/Panels/Menus/PanelViewMenu.vue
+++ b/client/src/components/Panels/Menus/PanelViewMenu.vue
@@ -1,5 +1,14 @@
 <template>
+    <b-button
+        v-if="showAdvanced"
+        variant="link"
+        class="w-100"
+        size="sm"
+        @click="$emit('update:show-advanced', !showAdvanced)">
+        <slot name="panel-view-selector"></slot><span class="sr-only">Close advanced tool search menu</span>
+    </b-button>
     <b-dropdown
+        v-else
         v-b-tooltip.hover.top.noninteractive
         right
         block
@@ -59,6 +68,10 @@ export default {
         currentPanelView: {
             type: String,
         },
+        showAdvanced: {
+            type: Boolean,
+            default: false,
+        },
         storeLoading: {
             type: Boolean,
             default: false,
diff --git a/client/src/components/Panels/ToolPanel.vue b/client/src/components/Panels/ToolPanel.vue
index 7d8080dbc5d2..b95fbaf2ebe1 100644
--- a/client/src/components/Panels/ToolPanel.vue
+++ b/client/src/components/Panels/ToolPanel.vue
@@ -139,6 +139,7 @@ function onInsertWorkflowSteps(workflowId: string, workflowStepCount: number | u
                     v-if="panelViews && Object.keys(panelViews).length > 1"
                     :panel-views="panelViews"
                     :current-panel-view="currentPanelView"
+                    :show-advanced.sync="showAdvanced"
                     :store-loading="loading"
                     @updatePanelView="updatePanelView">
                     <template v-slot:panel-view-selector>
diff --git a/client/src/components/SingleItemSelector.vue b/client/src/components/SingleItemSelector.vue
index da73c01782b0..5148339547d9 100644
--- a/client/src/components/SingleItemSelector.vue
+++ b/client/src/components/SingleItemSelector.vue
@@ -4,7 +4,7 @@
         <Multiselect
             v-if="items"
             v-model="selectedItem"
-            deselect-label="Can't remove this value"
+            :deselect-label="null"
             track-by="id"
             label="text"
             :options="items"