diff --git a/static/koboldai.js b/static/koboldai.js
index d996dc58..c62fdc70 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -2829,7 +2829,7 @@ function close_menus() {
 	document.getElementById('save-confirm').classList.add("hidden");
 	document.getElementById('error_message').classList.add("hidden");
 	document.getElementById("advanced_theme_editor").classList.add("hidden");
-	
+	document.getElementById("context-viewer-container").classList.add("hidden");
 	
 	//unselect sampler items
 	for (temp of document.getElementsByClassName("sample_order")) {
diff --git a/templates/index_new.html b/templates/index_new.html
index a04ee9d1..1af01ab6 100644
--- a/templates/index_new.html
+++ b/templates/index_new.html
@@ -113,41 +113,10 @@
 	</div>
 	<iframe id="download_iframe" style="display:none;"></iframe>
 
-	<div id="context-viewer-container" class="hidden">
-		<div id="context-viewer">
-			<div id="context-viewer-header">
-				<h3 class="noselect">Context Viewer</h3>
-				<div id="context-viewer-header-right">
-					<div>
-						<span class="noselect">Key:</span>
-						<div>
-							<span class="noselect context-block-example context-sp">Soft Prompt</span>
-							<span class="noselect context-block-example context-prompt">Prompt</span>
-							<span class="noselect context-block-example context-wi">World Info</span>
-							<span class="noselect context-block-example context-memory">Memory</span>
-							<span class="noselect context-block-example context-an">Author's Note</span>
-							<span class="noselect context-block-example context-action">Action</span>
-						</div>
-					</div>
-					<span id="context-viewer-close" class="material-icons-outlined">close</span>
-				</div>
-			</div>
-			<span class="help_text">
-				Context is the text the AI is sent when you ask it to generate text.
-				As the context is limited in size, you can use the Context Viewer to check if things you want the AI to know are in the context.
-			</span>
-			<div id="context-container"></div>
-		</div>
-	</div>
-
 	<div id="file-upload-notice" class="hidden">
 		<span class="material-icons-outlined">upload_file</span>
 	</div>
 
-	<div id="finder-container" class="hidden">
-		<div id="finder">
-			<input id="finder-input" placeholder="Search for something..."></input>
-		</div>
-	</div>
+	
 </body>
 </html>
\ No newline at end of file
diff --git a/templates/popups.html b/templates/popups.html
index 1a6e0051..594da66f 100644
--- a/templates/popups.html
+++ b/templates/popups.html
@@ -109,4 +109,37 @@
 	<div class="popup_load_cancel">
 		<button type="button" class="btn btn-primary" onclick="document.getElementById('advanced_theme_editor').classList.add('hidden');">Ok</button>
 	</div>
+</div>
+<!---------------- Context Viewer ---------------------->
+<div id="context-viewer-container" class="hidden">
+	<div id="context-viewer">
+		<div id="context-viewer-header">
+			<h3 class="noselect">Context Viewer</h3>
+			<div id="context-viewer-header-right">
+				<div>
+					<span class="noselect">Key:</span>
+					<div>
+						<span class="noselect context-block-example context-sp">Soft Prompt</span>
+						<span class="noselect context-block-example context-prompt">Prompt</span>
+						<span class="noselect context-block-example context-wi">World Info</span>
+						<span class="noselect context-block-example context-memory">Memory</span>
+						<span class="noselect context-block-example context-an">Author's Note</span>
+						<span class="noselect context-block-example context-action">Action</span>
+					</div>
+				</div>
+				<span id="context-viewer-close" class="material-icons-outlined">close</span>
+			</div>
+		</div>
+		<span class="help_text">
+			Context is the text the AI is sent when you ask it to generate text.
+			As the context is limited in size, you can use the Context Viewer to check if things you want the AI to know are in the context.
+		</span>
+		<div id="context-container"></div>
+	</div>
+</div>
+<!---------------- Finder ---------------------->
+<div id="finder-container" class="hidden">
+	<div id="finder">
+		<input id="finder-input" placeholder="Search for something..."></input>
+	</div>
 </div>
\ No newline at end of file