diff --git a/client/src/templates/Challenges/classic/desktop-layout.tsx b/client/src/templates/Challenges/classic/desktop-layout.tsx
index 358b09a032d..3909edd0854 100644
--- a/client/src/templates/Challenges/classic/desktop-layout.tsx
+++ b/client/src/templates/Challenges/classic/desktop-layout.tsx
@@ -102,8 +102,13 @@ const DesktopLayout = (props: DesktopLayoutProps): JSX.Element => {
   const displayPreviewPane = hasPreview && showPreviewPane;
   const displayPreviewPortal = hasPreview && showPreviewPortal;
   const displayNotes = projectBasedChallenge ? showNotes && hasNotes : false;
-  const displayConsole =
-    projectBasedChallenge || isMultifileCertProject ? showConsole : true;
+  const displayEditorConsole = !(
+    projectBasedChallenge || isMultifileCertProject
+  )
+    ? true
+    : false;
+  const displayPreviewConsole =
+    (projectBasedChallenge || isMultifileCertProject) && showConsole;
   const {
     codePane,
     editorPane,
@@ -150,10 +155,10 @@ const DesktopLayout = (props: DesktopLayoutProps): JSX.Element => {
               >
                 {editor}
               </ReflexElement>
-              {displayConsole && (
+              {displayEditorConsole && (
                 <ReflexSplitter propagate={true} {...resizeProps} />
               )}
-              {displayConsole && (
+              {displayEditorConsole && (
                 <ReflexElement
                   flex={testsPane.flex}
                   {...reflexProps}
@@ -172,12 +177,22 @@ const DesktopLayout = (props: DesktopLayoutProps): JSX.Element => {
           </ReflexElement>
         )}
 
-        {displayPreviewPane && (
+        {(displayPreviewPane || displayPreviewConsole) && (
           <ReflexSplitter propagate={true} {...resizeProps} />
         )}
-        {displayPreviewPane && (
+        {(displayPreviewPane || displayPreviewConsole) && (
           <ReflexElement flex={previewPane.flex} {...resizeProps}>
-            {preview}
+            <ReflexContainer orientation='horizontal'>
+              {displayPreviewPane && <ReflexElement>{preview}</ReflexElement>}
+              {displayPreviewPane && displayPreviewConsole && (
+                <ReflexSplitter propagate={true} {...resizeProps} />
+              )}
+              {displayPreviewConsole && (
+                <ReflexElement flex={testsPane.flex} {...resizeProps}>
+                  {testOutput}
+                </ReflexElement>
+              )}
+            </ReflexContainer>
           </ReflexElement>
         )}
       </ReflexContainer>