diff --git a/packages/base/src/panelview/components/layers.tsx b/packages/base/src/panelview/components/layers.tsx
index 9ffa26c7..01be4b33 100644
--- a/packages/base/src/panelview/components/layers.tsx
+++ b/packages/base/src/panelview/components/layers.tsx
@@ -90,6 +90,8 @@ export class LayersPanel extends Panel {
       case 'mouseup':
         this._mouseUpEvent(event as MouseEvent);
         break;
+      default:
+        break;
     }
   }
 
@@ -125,8 +127,6 @@ export class LayersPanel extends Panel {
     if (!node) {
       return;
     }
-    // (event.target as HTMLElement).tabIndex = 0;
-    // (event.target as HTMLElement).focus();
 
     node.tabIndex = 0;
     node.focus();
diff --git a/python/jupytergis_lab/src/index.ts b/python/jupytergis_lab/src/index.ts
index b4c56dcf..2d1fe153 100644
--- a/python/jupytergis_lab/src/index.ts
+++ b/python/jupytergis_lab/src/index.ts
@@ -75,7 +75,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
     app.commands.addKeyBinding({
       command: CommandIDs.removeLayer,
       keys: ['Delete'],
-      selector: '.jp-gis-layerTitle'
+      selector: '.jp-gis-layerTitle .jp-gis-layerText'
     });
 
     app.contextMenu.addItem({
@@ -87,7 +87,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
     app.commands.addKeyBinding({
       command: CommandIDs.renameLayer,
       keys: ['F2'],
-      selector: '.jp-gis-layerTitle'
+      selector: '.jp-gis-layerTitle .jp-gis-layerText'
     });
 
     const submenu = new Menu({ commands: app.commands });
@@ -122,7 +122,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
     app.commands.addKeyBinding({
       command: CommandIDs.removeGroup,
       keys: ['Delete'],
-      selector: '.jp-gis-layerGroupHeader'
+      selector: '.jp-gis-layerGroupHeader .jp-gis-layerText'
     });
 
     app.contextMenu.addItem({
@@ -134,7 +134,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
     app.commands.addKeyBinding({
       command: CommandIDs.renameGroup,
       keys: ['F2'],
-      selector: '.jp-gis-layerGroupHeader'
+      selector: '.jp-gis-layerGroupHeader .jp-gis-layerText'
     });
 
     if (mainMenu) {