diff --git a/OHIFViewer/client/components/viewer/viewer.html b/OHIFViewer/client/components/viewer/viewer.html
index fb4ab5b2c..91e4cc2fc 100644
--- a/OHIFViewer/client/components/viewer/viewer.html
+++ b/OHIFViewer/client/components/viewer/viewer.html
@@ -1,19 +1,19 @@
 <template name="viewer">
-    {{#if Template.subscriptionsReady}}
-    <div class="viewerDialogs">
-        {{>cineDialog}}
-        {{>layoutChooser}}
-        {{>annotationDialogs}}
+    {{#if and Template.subscriptionsReady}}
+        <div class="viewerDialogs">
+            {{>cineDialog}}
+            {{>layoutChooser}}
+            {{>annotationDialogs}}
 
-        <!-- Hanging Protocol dialogs -->
-        {{>ruleEntryDialog}}
-        {{>settingEntryDialog}}
-        {{>textEntryDialog}}
-    </div>
-    <div id="viewer">
-        {{>toolbarSection (clone this)}}
-        {{>flexboxLayout (clone this)}}
-    </div>
+            <!-- Hanging Protocol dialogs -->
+            {{>ruleEntryDialog}}
+            {{>settingEntryDialog}}
+            {{>textEntryDialog}}
+        </div>
+        <div id="viewer">
+            {{>toolbarSection (clone this)}}
+            {{>flexboxLayout (clone this)}}
+        </div>
     {{else}}
         {{>loadingText}}
     {{/if}}
diff --git a/Packages/ohif-study-list/client/components/studylist/studylist.html b/Packages/ohif-study-list/client/components/studylist/studylist.html
index 2f7db86d4..a98507e59 100644
--- a/Packages/ohif-study-list/client/components/studylist/studylist.html
+++ b/Packages/ohif-study-list/client/components/studylist/studylist.html
@@ -9,7 +9,6 @@
             <div class="viewerContainer">
             </div>
         </div>
-        {{>loadingText}}
     </div>
     {{#each templateName in additionalTemplates}}
         {{> UI.dynamic template=templateName}}
diff --git a/Packages/ohif-study-list/client/lib/switchToTab.js b/Packages/ohif-study-list/client/lib/switchToTab.js
index e5946d7ff..72d53f0f4 100644
--- a/Packages/ohif-study-list/client/lib/switchToTab.js
+++ b/Packages/ohif-study-list/client/lib/switchToTab.js
@@ -81,7 +81,6 @@ switchToTab = function(contentId) {
         // Attempt to retrieve the meta data (it might be cached)
         OHIF.studylist.getStudiesMetadata(studyInstanceUids, function(studies) {
             viewStudiesInTab(contentId, studies);
-            Session.set('GettingStudyMetadata', false);
         });
     }
 };