diff --git a/public/app/listeners/index.js b/public/app/listeners/index.js
index 62e0806e..7ef44834 100644
--- a/public/app/listeners/index.js
+++ b/public/app/listeners/index.js
@@ -12,6 +12,7 @@ const showLoadSpacePrompt = require('./showLoadSpacePrompt');
 const showExportSpacePrompt = require('./showExportSpacePrompt');
 const showDeleteSpacePrompt = require('./showDeleteSpacePrompt');
 const getUserFolder = require('./getUserFolder');
+const setLanguage = require('./setLanguage');
 const getLanguage = require('./getLanguage');
 
 module.exports = {
@@ -29,5 +30,6 @@ module.exports = {
   showExportSpacePrompt,
   showDeleteSpacePrompt,
   getUserFolder,
+  setLanguage,
   getLanguage,
 };
diff --git a/public/app/listeners/setLanguage.js b/public/app/listeners/setLanguage.js
new file mode 100644
index 00000000..341a527f
--- /dev/null
+++ b/public/app/listeners/setLanguage.js
@@ -0,0 +1,15 @@
+const { SET_LANGUAGE_CHANNEL } = require('../config/channels');
+const logger = require('../logger');
+const { ERROR_GENERAL } = require('../config/errors');
+
+const setLanguage = (mainWindow, db) => async (event, lang) => {
+  try {
+    db.set('user.lang', lang).write();
+    mainWindow.webContents.send(SET_LANGUAGE_CHANNEL, lang);
+  } catch (e) {
+    logger.error(e);
+    mainWindow.webContents.send(SET_LANGUAGE_CHANNEL, ERROR_GENERAL);
+  }
+};
+
+module.exports = setLanguage;
diff --git a/public/electron.js b/public/electron.js
index 935a5832..09b15dc3 100644
--- a/public/electron.js
+++ b/public/electron.js
@@ -66,6 +66,7 @@ const {
   getGeolocationEnabled,
   setGeolocationEnabled,
   getUserFolder,
+  setLanguage,
   getLanguage,
 } = require('./app/listeners');
 const isMac = require('./app/utils/isMac');
@@ -328,15 +329,7 @@ app.on('ready', async () => {
   ipcMain.on(GET_LANGUAGE_CHANNEL, getLanguage(mainWindow, db));
 
   // called when setting language
-  ipcMain.on(SET_LANGUAGE_CHANNEL, (event, lang) => {
-    try {
-      db.set('user.lang', lang).write();
-      mainWindow.webContents.send(SET_LANGUAGE_CHANNEL, lang);
-    } catch (e) {
-      logger.error(e);
-      mainWindow.webContents.send(SET_LANGUAGE_CHANNEL, ERROR_GENERAL);
-    }
-  });
+  ipcMain.on(SET_LANGUAGE_CHANNEL, setLanguage(mainWindow));
 
   // called when getting developer mode
   ipcMain.on(GET_DEVELOPER_MODE_CHANNEL, () => {