diff --git a/app/main/index.js b/app/main/index.js
index bc727a56..56e74311 100644
--- a/app/main/index.js
+++ b/app/main/index.js
@@ -70,8 +70,8 @@ function createMainWindow() {
 	});
 
 	win.on('focus', () => {
-		win.webContents.send('focus')
-	})
+		win.webContents.send('focus');
+	});
 
 	win.once('ready-to-show', () => {
 		win.show();
diff --git a/app/renderer/js/main.js b/app/renderer/js/main.js
index 68186bc4..96641842 100644
--- a/app/renderer/js/main.js
+++ b/app/renderer/js/main.js
@@ -4,9 +4,9 @@ require(__dirname + '/js/tray.js');
 
 const DomainUtil = require(__dirname + '/js/utils/domain-util.js');
 const SystemUtil = require(__dirname + '/js/utils/system-util.js');
-const { linkIsInternal, skipImages } = require(__dirname + '/../main/link-helper');
-const { shell, ipcRenderer } = require('electron');
-const { app, dialog } = require('electron').remote;
+const {linkIsInternal, skipImages} = require(__dirname + '/../main/link-helper');
+const {shell, ipcRenderer} = require('electron');
+const {app, dialog} = require('electron').remote;
 
 class ServerManagerView {
 	constructor() {
@@ -168,7 +168,7 @@ class ServerManagerView {
 
 	registerListeners($webView, index) {
 		$webView.addEventListener('new-window', event => {
-			const { url } = event;
+			const {url} = event;
 			const domainPrefix = this.domainUtil.getDomain(this.activeTabIndex).url;
 			if (linkIsInternal(domainPrefix, url) && url.match(skipImages) === null) {
 				event.preventDefault();
@@ -189,9 +189,10 @@ class ServerManagerView {
 		$webView.addEventListener('did-start-loading', () => {
 			$webView.setUserAgent(this.systemUtil.getUserAgent() + $webView.getUserAgent());
 		});
-		// eslint-disable-next-line no-unused-vars
+		// eslint-disable-next-line arrow-parens
 		$webView.addEventListener('did-fail-load', (event) => {
-			const { errorCode, errorDescription, validatedURL } = event;
+			// eslint-disable-next-line no-unused-vars
+			const {errorCode, errorDescription, validatedURL} = event;
 			const hasConnectivityErr = (this.systemUtil.connectivityERR.indexOf(errorDescription) >= 0);
 			if (hasConnectivityErr) {
 				console.error('error', errorDescription);
@@ -235,7 +236,7 @@ class ServerManagerView {
 
 		ipcRenderer.on('focus', () => {
 			const activeWebview = document.getElementById(`webview-${this.activeTabIndex}`);
-			activeWebview.focus()
+			activeWebview.focus();
 		});
 
 		ipcRenderer.on('forward', () => {
diff --git a/app/renderer/js/utils/system-util.js b/app/renderer/js/utils/system-util.js
index 74e96f58..ae3ca1ad 100644
--- a/app/renderer/js/utils/system-util.js
+++ b/app/renderer/js/utils/system-util.js
@@ -5,36 +5,36 @@ const {app} = require('electron').remote;
 const os = require('os');
 
 class SystemUtil {
-    constructor() {
-        this.connectivityERR = [
-            'ERR_INTERNET_DISCONNECTED',
-            'ERR_PROXY_CONNECTION_FAILED',
-            'ERR_CONNECTION_RESET',
-            'ERR_NOT_CONNECTED',
-            'ERR_NAME_NOT_RESOLVED',
-            'ERR_NETWORK_CHANGED'
-        ];
-    }
-    
-    getOS() {
-        if (os.platform() === 'darwin') {
-            return 'Mac';
-        }
-        if (os.platform() === 'linux') {
-            return 'Linux';
-        }
-        if (os.platform() === 'win32' || os.platform() === 'win64') {
-            if (parseFloat(os.release()) < 6.2) {
-                return 'Windows 7';
-            } else {
-                return 'Windows 10';
-            }
-        }
-    }
+	constructor() {
+		this.connectivityERR = [
+			'ERR_INTERNET_DISCONNECTED',
+			'ERR_PROXY_CONNECTION_FAILED',
+			'ERR_CONNECTION_RESET',
+			'ERR_NOT_CONNECTED',
+			'ERR_NAME_NOT_RESOLVED',
+			'ERR_NETWORK_CHANGED'
+		];
+	}
 
-    getUserAgent() {
-        return 'ZulipElectron/' + app.getVersion() + ' ' + this.getOS();
-    }
+	getOS() {
+		if (os.platform() === 'darwin') {
+			return 'Mac';
+		}
+		if (os.platform() === 'linux') {
+			return 'Linux';
+		}
+		if (os.platform() === 'win32' || os.platform() === 'win64') {
+			if (parseFloat(os.release()) < 6.2) {
+				return 'Windows 7';
+			} else {
+				return 'Windows 10';
+			}
+		}
+	}
+
+	getUserAgent() {
+		return 'ZulipElectron/' + app.getVersion() + ' ' + this.getOS();
+	}
 }
 
 module.exports = SystemUtil;