diff --git a/dev/Common/Links.js b/dev/Common/Links.js
index 2364db382..de9468206 100644
--- a/dev/Common/Links.js
+++ b/dev/Common/Links.js
@@ -149,7 +149,7 @@ export function themePreviewLink(theme) {
  * @param {string} inboxFolderName = 'INBOX'
  * @returns {string}
  */
-export function inbox(inboxFolderName = 'INBOX') {
+export function mailbox(inboxFolderName = 'INBOX') {
 	return HASH_PREFIX + 'mailbox/' + inboxFolderName;
 }
 
diff --git a/dev/Common/Selector.js b/dev/Common/Selector.js
index 36bf86c6a..ff8ca4a33 100644
--- a/dev/Common/Selector.js
+++ b/dev/Common/Selector.js
@@ -359,15 +359,11 @@ export class Selector {
 		if (result) {
 			this.focusedItem(result);
 
-			if (focused) {
-				if (bShiftKey && isArrow) {
-					focused.checked(!focused.checked());
-				} else if (' ' === sEventKey) {
-					focused.checked(!focused.checked());
-				}
+			if (focused && ((bShiftKey && isArrow) || ' ' === sEventKey)) {
+				focused.checked(!focused.checked());
 			}
 
-			if ((this.autoSelect() || !!bForceSelect) && !this.isListChecked() && ' ' !== sEventKey) {
+			if (' ' !== sEventKey && (this.autoSelect() || !!bForceSelect) && !this.isListChecked()) {
 				this.selectedItem(result);
 			}
 
diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js
index 35f3558e4..4c9da4907 100644
--- a/dev/View/User/MailBox/FolderList.js
+++ b/dev/View/User/MailBox/FolderList.js
@@ -18,7 +18,7 @@ import { ComposePopupView } from 'View/Popup/Compose';
 import { FolderCreatePopupView } from 'View/Popup/FolderCreate';
 import { ContactsPopupView } from 'View/Popup/Contacts';
 
-class FolderListMailBoxUserView extends AbstractViewLeft {
+export class FolderListMailBoxUserView extends AbstractViewLeft {
 	constructor() {
 		super('User/MailBox/FolderList', 'MailFolderList');
 
@@ -220,5 +220,3 @@ class FolderListMailBoxUserView extends AbstractViewLeft {
 		}
 	}
 }
-
-export { FolderListMailBoxUserView };
diff --git a/dev/View/User/Settings/Menu.js b/dev/View/User/Settings/Menu.js
index 66e27b4dc..02d1572a7 100644
--- a/dev/View/User/Settings/Menu.js
+++ b/dev/View/User/Settings/Menu.js
@@ -1,12 +1,12 @@
 import { KeyState } from 'Common/Enums';
 import { leftPanelDisabled } from 'Common/Globals';
-import { settings, inbox } from 'Common/Links';
+import { settings, mailbox } from 'Common/Links';
 import { getFolderInboxName } from 'Common/Cache';
 
 import { settingsMenuKeysHandler } from 'Knoin/Knoin';
 import { AbstractViewLeft } from 'Knoin/AbstractViews';
 
-class MenuSettingsUserView extends AbstractViewLeft {
+export class MenuSettingsUserView extends AbstractViewLeft {
 	/**
 	 * @param {Object} screen
 	 */
@@ -36,8 +36,6 @@ class MenuSettingsUserView extends AbstractViewLeft {
 	}
 
 	backToMailBoxClick() {
-		rl.route.setHash(inbox(getFolderInboxName()));
+		rl.route.setHash(mailbox(getFolderInboxName()));
 	}
 }
-
-export { MenuSettingsUserView };
diff --git a/dev/View/User/Settings/Pane.js b/dev/View/User/Settings/Pane.js
index 81f993beb..9a7206a5e 100644
--- a/dev/View/User/Settings/Pane.js
+++ b/dev/View/User/Settings/Pane.js
@@ -1,4 +1,4 @@
-import { inbox } from 'Common/Links';
+import { mailbox } from 'Common/Links';
 import { getFolderInboxName } from 'Common/Cache';
 import { leftPanelDisabled } from 'Common/Globals';
 
@@ -6,7 +6,7 @@ import MessageStore from 'Stores/User/Message';
 
 import { AbstractViewRight } from 'Knoin/AbstractViews';
 
-class PaneSettingsUserView extends AbstractViewRight {
+export class PaneSettingsUserView extends AbstractViewRight {
 	constructor() {
 		super('User/Settings/Pane', 'SettingsPane');
 
@@ -38,8 +38,6 @@ class PaneSettingsUserView extends AbstractViewRight {
 	}
 
 	backToMailBoxClick() {
-		rl.route.setHash(inbox(getFolderInboxName()));
+		rl.route.setHash(mailbox(getFolderInboxName()));
 	}
 }
-
-export { PaneSettingsUserView };