2 files changed, 4 insertions, 5 deletions
diff --git a/web/app/view/edit/Devices.js b/web/app/view/edit/Devices.js
index dfa855c8..21fdb32a 100644
--- a/web/app/view/edit/Devices.js
+++ b/web/app/view/edit/Devices.js
@@ -75,8 +75,7 @@ Ext.define('Traccar.view.edit.Devices', {
     },
 
     listeners: {
-        rowclick: 'onSelectionChange',
-        itemkeyup: 'onSelectionChange'
+        selectionchange: 'onSelectionChange'
     },
 
     viewConfig: {
diff --git a/web/app/view/edit/DevicesController.js b/web/app/view/edit/DevicesController.js
index 82e471c2..f4e46153 100644
--- a/web/app/view/edit/DevicesController.js
+++ b/web/app/view/edit/DevicesController.js
@@ -111,9 +111,9 @@ Ext.define('Traccar.view.edit.DevicesController', {
     },
 
     onSelectionChange: function (el, record) {
-        if (record) {
-            this.updateButtons([record]);
-            this.fireEvent('selectdevice', record, true);
+        if (record && record.length) {
+            this.updateButtons(record);
+            this.fireEvent('selectdevice', record[0], true);
         }
     },