diff --git a/static/js/directives/settings.js b/static/js/directives/settings.js
index 0dd5f217..1fb5107f 100644
--- a/static/js/directives/settings.js
+++ b/static/js/directives/settings.js
@@ -146,7 +146,7 @@ define(['jquery', 'underscore', 'text!partials/settings.html'], function($, _, t
 			});
 
 			$scope.maybeShowSettings = function() {
-				if ($scope.autoshowSettings) {
+				if ($scope.autoshowSettings && mediaStream.connector.connected && !appData.authorizing()) {
 					$scope.autoshowSettings = false;
 					if (!$scope.loadedUser) {
 						$scope.layout.settings = true;