diff --git a/src/app/editor/lsp-manager/lsp-manager.component.html b/src/app/editor/lsp-manager/lsp-manager.component.html
index a71df26..14e5b7d 100644
--- a/src/app/editor/lsp-manager/lsp-manager.component.html
+++ b/src/app/editor/lsp-manager/lsp-manager.component.html
@@ -2,10 +2,6 @@
 
     <div class="row mt-2 mb-3">
 
-        <div class="col col-auto">
-            <button class="btn btn-sm btn-dark" (click)="createLanguageClient()">Create Language Client</button>
-        </div>
-
         <div class="col clear-right-padding">
             <div class="input-group-sm">
                 <label class="form-control" [innerText]="lspManagerService.workspaceFolder || 'Project Path...'">
@@ -39,15 +35,21 @@
     </div>
 
     <div class="row mt-2 md-2">
+            <div class="col col-sm" [hidden]="!lspManagerService.workspaceFolder">
+                <button class="btn btn-sm btn-dark" (click)="createLanguageClient()">Create Language Client</button>
+            </div>
+
         <div class="col">
             Target Editor:  <label [innerText]="editor?.id || '...'"></label>
         </div>
-        <div class="col-sm">
+
+        <div class="col-sm" [hidden]="!lspManagerService.workspaceFolder">
             <button class="btn btn-sm btn-dark"
                 (click)="registerEditorToLanguageClient()">
                 Register Editor To LSP
             </button>
         </div>
+
         <div class="col">
             Active Editor Session:
         </div>