diff --git a/lib/screens/envvar/environments_pane.dart b/lib/screens/envvar/environments_pane.dart
index 34d58e4b..48f2eed4 100644
--- a/lib/screens/envvar/environments_pane.dart
+++ b/lib/screens/envvar/environments_pane.dart
@@ -193,6 +193,9 @@ class EnvironmentItem extends ConsumerWidget {
         ref.read(selectedEnvironmentIdStateProvider.notifier).state = id;
         kEnvScaffoldKey.currentState?.closeDrawer();
       },
+      onSecondaryTap: () {
+        ref.read(selectedEnvironmentIdStateProvider.notifier).state = id;
+      },
       focusNode: ref.watch(nameTextFieldFocusNodeProvider),
       onChangedNameEditor: (value) {
         value = value.trim();
diff --git a/lib/widgets/card_sidebar_environment.dart b/lib/widgets/card_sidebar_environment.dart
index 65ca48a9..69426df0 100644
--- a/lib/widgets/card_sidebar_environment.dart
+++ b/lib/widgets/card_sidebar_environment.dart
@@ -96,6 +96,7 @@ class SidebarEnvironmentCard extends StatelessWidget {
                             focusNode: focusNode,
                             style: Theme.of(context).textTheme.bodyMedium,
                             onTapOutside: (_) {
+                              FocusScope.of(context).unfocus();
                               onTapOutsideNameEditor?.call();
                             },
                             onFieldSubmitted: (value) {
diff --git a/lib/widgets/card_sidebar_request.dart b/lib/widgets/card_sidebar_request.dart
index 2c6167bd..27cbabf6 100644
--- a/lib/widgets/card_sidebar_request.dart
+++ b/lib/widgets/card_sidebar_request.dart
@@ -117,17 +117,15 @@ class SidebarRequestCard extends StatelessWidget {
                             overflow: TextOverflow.fade,
                           ),
                   ),
-                  kIsMobile
-                      ? Visibility(
-                          visible: isSelected && !inEditMode,
-                          child: SizedBox(
-                            width: 28,
-                            child: ItemCardMenu(
-                              onSelected: onMenuSelected,
-                            ),
-                          ),
-                        )
-                      : kSizedBoxEmpty,
+                  Visibility(
+                    visible: isSelected && !inEditMode,
+                    child: SizedBox(
+                      width: 28,
+                      child: ItemCardMenu(
+                        onSelected: onMenuSelected,
+                      ),
+                    ),
+                  ),
                 ],
               ),
             ),
diff --git a/test/providers/ui_providers_test.dart b/test/providers/ui_providers_test.dart
index 579939b5..ff2102a6 100644
--- a/test/providers/ui_providers_test.dart
+++ b/test/providers/ui_providers_test.dart
@@ -349,11 +349,7 @@ void main() {
       await tester.pump();
       await tester.tap(find.byType(RequestItem));
       await tester.pump();
-      // await tester.tap(find.byIcon(Icons.more_vert).at(1));
-      await tester.tap(
-        find.byType(RequestItem),
-        buttons: kSecondaryButton,
-      );
+      await tester.tap(find.byIcon(Icons.more_vert).at(1));
       await tester.pumpAndSettle();
 
       // Tap on the "Rename" option in the menu