diff --git a/CRM/Contact/BAO/SavedSearch.php b/CRM/Contact/BAO/SavedSearch.php
index 1695f82c227a..7a6715a3f294 100644
--- a/CRM/Contact/BAO/SavedSearch.php
+++ b/CRM/Contact/BAO/SavedSearch.php
@@ -361,9 +361,9 @@ public static function decodeRelativeFields(&$formValues, $fieldName, $op, $valu
    */
   public static function getEditSearchUrl($id) {
     $savedSearch = self::retrieve(['id' => $id]);
-    // APIv4 search
+    // APIv4 - Link to SearchKit
     if (!empty($savedSearch->api_entity)) {
-      return CRM_Utils_System::url('civicrm/admin/search', NULL, FALSE, "/edit/$id");
+      return CRM_Utils_System::url('civicrm/admin/search', NULL, FALSE, "/edit/$id?tab=group");
     }
     // Classic search builder
     if (!empty($savedSearch->mapping_id)) {
diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
index 1d5269631ee3..abff1be671e6 100644
--- a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
+++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
@@ -334,7 +334,7 @@
       // Set current tab: Tab is passed through url by toggleEntitySet
       let defaultTab = $location.search().tab;
       if (!defaultTab || !this.mainTabs.some(t => t.key === defaultTab)) {
-        defaultTab = this.mainTabs[0].key;
+        defaultTab = defaultTab === 'group' && this.groupExists ? 'group' : this.mainTabs[0].key;
       }
       $scope.controls = {tab: defaultTab, joinType: 'LEFT'};
 
diff --git a/ext/search_kit/ang/crmSearchAdmin/tabs.html b/ext/search_kit/ang/crmSearchAdmin/tabs.html
index 96d36664d1a9..f61ac408d022 100644
--- a/ext/search_kit/ang/crmSearchAdmin/tabs.html
+++ b/ext/search_kit/ang/crmSearchAdmin/tabs.html
@@ -37,7 +37,6 @@
         {{:: ts('Smart Group') }}
       </a>
     </li>
-    <li class="dropdown-header">{{:: ts('Display') }}</li>
     <li ng-repeat="type in ::$ctrl.displayTypes">
       <a href ng-click="$ctrl.addDisplay(type.id)" title="{{:: type.description }}">
         <i class="crm-i {{:: type.icon }}" role="img" aria-hidden="true"></i>