diff --git a/src/components/quickConnectSettings/quickConnectSettings.js b/src/components/quickConnectSettings/quickConnectSettings.js
index a62cfc229..e802f92ba 100644
--- a/src/components/quickConnectSettings/quickConnectSettings.js
+++ b/src/components/quickConnectSettings/quickConnectSettings.js
@@ -36,10 +36,6 @@ export class QuickConnectSettings {
             throw e;
         });
     }
-
-    submit() {
-        return false;
-    }
 }
 
 export default QuickConnectSettings;
diff --git a/src/controllers/dashboard/quickconnect.js b/src/controllers/dashboard/quickconnect.js
index 012f7b7aa..87c88d8a4 100644
--- a/src/controllers/dashboard/quickconnect.js
+++ b/src/controllers/dashboard/quickconnect.js
@@ -2,57 +2,57 @@ import loading from 'loading';
 import toast from 'toast';
 import globalize from 'globalize';
 
-/* eslint-disable indent */
+const unavailable = 'Unavailable';
+const available = 'Available';
+const active = 'Active';
+let page;
 
-    let page;
-    export default function(view) {
-        view.addEventListener('viewshow', function () {
-            page = this;
-            loading.show();
-            page.querySelector('#btnQuickConnectSubmit').onclick = onSubmit;
-            updatePage();
-        });
-    }
-
-    function loadPage(status) {
-        let available = status === 'Available' || status === 'Active';
-
-        page.querySelector('#quickConnectStatus').textContent = status.toLocaleLowerCase();
-        page.querySelector('#chkQuickConnectAvailable').checked = available;
-
-        loading.hide();
-    }
-
-    function onSubmit() {
+export default function(view) {
+    view.addEventListener('viewshow', function () {
+        page = this;
         loading.show();
+        page.querySelector('#btnQuickConnectSubmit').onclick = onSubmit;
+        updatePage();
+    });
+}
 
-        let newStatus = page.querySelector('#chkQuickConnectAvailable').checked ? 'Available' : 'Unavailable';
+function loadPage(status) {
+    let check = status === available || status === active;
 
-        let url = ApiClient.getUrl('/QuickConnect/Available?Status=' + newStatus);
+    page.querySelector('#quickConnectStatus').textContent = status.toLocaleLowerCase();
+    page.querySelector('#chkQuickConnectAvailable').checked = check;
 
-        ApiClient.ajax({
-            type: 'POST',
-            url: url
-        }, true).then(() => {
-            toast(globalize.translate('SettingsSaved'));
-            setTimeout(updatePage, 500);
+    loading.hide();
+}
 
-            return true;
-        }).catch((e) => {
-            console.error('Unable to set quick connect status. error:', e);
-        });
+function onSubmit() {
+    loading.show();
 
-        loading.hide();
-        return false;
-    }
+    let newStatus = page.querySelector('#chkQuickConnectAvailable').checked ? available : unavailable;
 
-    function updatePage() {
-        ApiClient.getQuickConnect('Status').then((response) => {
-            loadPage(response);
-            return true;
-        }).catch((e) => {
-            console.error('Unable to get quick connect status. error:', e);
-        });
-    }
+    let url = ApiClient.getUrl('/QuickConnect/Available?Status=' + newStatus);
 
-/* eslint-enable indent */
+    ApiClient.ajax({
+        type: 'POST',
+        url: url
+    }, true).then(() => {
+        toast(globalize.translate('SettingsSaved'));
+        setTimeout(updatePage, 500);
+
+        return true;
+    }).catch((e) => {
+        console.error('Unable to set quick connect status. error:', e);
+    });
+
+    loading.hide();
+    return false;
+}
+
+function updatePage() {
+    ApiClient.getQuickConnect('Status').then((response) => {
+        loadPage(response);
+        return true;
+    }).catch((e) => {
+        console.error('Unable to get quick connect status. error:', e);
+    });
+}
diff --git a/src/controllers/user/quickConnect/index.js b/src/controllers/user/quickConnect/index.js
index 9e8d1a3b3..00fc5488b 100644
--- a/src/controllers/user/quickConnect/index.js
+++ b/src/controllers/user/quickConnect/index.js
@@ -33,11 +33,6 @@ export default function (view) {
 
         renderPage();
     });
-    view.addEventListener('viewbeforehide', function () {
-        if (quickConnectSettingsInstance) {
-            quickConnectSettingsInstance.submit();
-        }
-    });
 
     function renderPage(forceActive = false) {
         ApiClient.getQuickConnect('Status').then((status) => {