diff --git a/webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx b/webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx
index 98667dd2eb..5cdf9680b7 100644
--- a/webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx
+++ b/webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx
@@ -7,7 +7,7 @@
  */
 
 import { observer } from 'mobx-react';
-import { useCallback, useLayoutEffect } from 'react';
+import { useCallback } from 'react';
 import {
   useMenuState,
   Menu,
@@ -79,11 +79,10 @@ export const PropertyValueSelector = observer(function PropertyValueSelector({
     },
     [menu, onSelect]
   );
-  useLayoutEffect(() => onSwitch(menu.visible), [menu.visible]);
 
   return styled(useStyles(styles))(
     <>
-      <MenuButton {...menu}>{children}</MenuButton>
+      <MenuButton {...menu} onClick={() => onSwitch(!menu.visible)}>{children}</MenuButton>
       <Menu {...menu} aria-label={propertyName}>
         {values.map(value => (
           <MenuItem key={value} type='button' {...menu} onClick={() => handleMenuSelect(value)}>
diff --git a/webapp/packages/plugin-data-export/src/locales/en.ts b/webapp/packages/plugin-data-export/src/locales/en.ts
index c199614c5a..fdb84a18e1 100644
--- a/webapp/packages/plugin-data-export/src/locales/en.ts
+++ b/webapp/packages/plugin-data-export/src/locales/en.ts
@@ -4,7 +4,7 @@ export default [
   ['data_transfer_dialog_configuration_title', 'Export configuration'],
   ['data_transfer_dialog_preparation', 'We prepare your file for export. Please wait...'],
   ['data_transfer_notification_preparation', 'We prepare your file for download. Please wait...'],
-  ['data_transfer_notification_ready', 'File ready to download'],
+  ['data_transfer_notification_ready', 'File is ready to download'],
   ['data_transfer_notification_error', 'Preparation failed or canceled'],
   ['data_transfer_notification_download', 'Download'],
   ['data_transfer_notification_delete', 'Delete'],
diff --git a/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeController.ts b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeController.ts
index 556d5b2ac0..00b8b0fc3a 100644
--- a/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeController.ts
+++ b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeController.ts
@@ -45,7 +45,7 @@ interface CellKeyDownEvent extends AgGridEvent{
 }
 
 const EVENT_KEY_CODE = {
-  C: 67,
+  C: 'KeyC',
 };
 
 interface TemporarySelectionRange {
@@ -103,7 +103,7 @@ export class RangeController implements IRangeController {
   }
 
   private handleDocumentCopy(event: KeyboardEvent) {
-    if (event.keyCode === EVENT_KEY_CODE.C && event.ctrlKey) {
+    if (event.code === EVENT_KEY_CODE.C && (event.ctrlKey || event.metaKey)) {
       this.copySelectedData();
     }
   }