diff --git a/components/Keyboard.js b/components/Keyboard.js
index e85ab06..064b8da 100644
--- a/components/Keyboard.js
+++ b/components/Keyboard.js
@@ -1,5 +1,5 @@
 import Key from './Key.js'
-import { getAudioFileName, loadKeyboardData, playKeyAudio } from '../utils.js'
+import { loadKeyboardData, playKeyAudio, getKeyContent } from '../utils.js'
 
 const Keyboard = {
 	template: `
@@ -47,7 +47,11 @@ const Keyboard = {
 			event.preventDefault()
 			const { code, shiftKey } = event
 
+			/* replace: 
 			const keyContent = this.getKeyContent(this.currentLang, code)
+			with next 2 lines */
+			const keyboardData = this.keyboardData[this.currentLang]
+			const keyContent = getKeyContent({ keyboardData, code })
 
 			this.setActiveKey(keyContent)
 			this.playKey(keyContent)
@@ -85,7 +89,11 @@ const Keyboard = {
 			playKeyAudio(currentLang, keyContent, shiftKey).catch(() => {
 				// fallback
 				if (this.currentLang !== 'en') {
+					/* replace: 
 					const keyContent = this.getKeyContent('en', code)
+					with next 2 lines */
+					const keyboardData = this.keyboardData['en']
+					const keyContent = getKeyContent({ keyboardData, code })
 					playKeyAudio('en', keyContent, shiftKey)
 				}
 			})
diff --git a/utils.js b/utils.js
index 87cf5d6..cba791f 100644
--- a/utils.js
+++ b/utils.js
@@ -48,3 +48,10 @@ export const playKeyAudio = (lang, keyContent, shiftKey) => {
 	const audio = new Audio(`../keyboardData/sounds/${lang}/${fileName}.mp3`)
 	return audio.play()
 }
+
+export const getKeyContent = ({ keyboardData, code = '', value = '' }) => {
+	return keyboardData.flat().find(elem => {
+		const { main, shifted } = elem
+		return elem.code === code || value === main || value === shifted
+	})
+}