diff --git a/deadlock-plugins/deadlock-extension/src/core/controller.ts b/deadlock-plugins/deadlock-extension/src/core/controller.ts
index 8f70e073fe7fcd4ab6433831c4acbddd9b5fabb8..a55ce6842209df1acbf29b9b87f5317c74ad0509 100644
--- a/deadlock-plugins/deadlock-extension/src/core/controller.ts
+++ b/deadlock-plugins/deadlock-extension/src/core/controller.ts
@@ -142,8 +142,6 @@ export default class Controller {
 
     await mission.setup(user);
 
-    openEditorInFolder(mission.directory);
-
-    vscode.commands.executeCommand(OPEN_QUICK_SETUP_COMMAND.cmd);
+    await openEditorInFolder(mission.directory);
   }
 }
diff --git a/deadlock-plugins/deadlock-extension/src/view/briefingView.ts b/deadlock-plugins/deadlock-extension/src/view/briefingView.ts
index 0465a0ccdb1464867d30658cba845ebfeaf2b3f2..d7c9141e5e929d5536805faa56f26630044e6f67 100644
--- a/deadlock-plugins/deadlock-extension/src/view/briefingView.ts
+++ b/deadlock-plugins/deadlock-extension/src/view/briefingView.ts
@@ -1,4 +1,5 @@
 import * as fs from 'fs';
+import isDocker from 'is-docker';
 import { marked } from 'marked';
 import * as path from 'path';
 import { setInterval } from 'timers';
@@ -53,6 +54,7 @@ export default class BriefingView extends WebviewBase {
               console.error(e);
               this.briefingContent = 'Error while parsing your briefing.';
             }
+            if (isDocker()) this.show();
           },
           (error) => {
             console.error('Cannot load briefing', error);