diff --git a/eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/eda-blank-panel.component.html b/eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/eda-blank-panel.component.html
index 3f0f288b4..a08d76f86 100644
--- a/eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/eda-blank-panel.component.html
+++ b/eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/eda-blank-panel.component.html
@@ -50,9 +50,7 @@ <h6 id="p-header" class="panel-title" style="cursor: default">
     <div (window:resize)="onResize($event)" class="grid">
 
         <div id="queryModelSelector" class="col-12">
-            <p-dropdown  class="float-right" [(ngModel)]="selectedQueryMode" [options]="queryModes"
-                [autoDisplayFirst]="false" [showClear]="true"
-                (ngModelChange)="changeQueryMode()" (onClear)="selectedQueryMode=null">
+            <p-dropdown  class="float-right" [(ngModel)]="selectedQueryMode" [options]="queryModes" (ngModelChange)="changeQueryMode()">
             </p-dropdown >
         </div>
 
diff --git a/eda/eda_app/src/app/module/pages/dashboard/dashboard.component.ts b/eda/eda_app/src/app/module/pages/dashboard/dashboard.component.ts
index 6029eed67..f096b7f36 100644
--- a/eda/eda_app/src/app/module/pages/dashboard/dashboard.component.ts
+++ b/eda/eda_app/src/app/module/pages/dashboard/dashboard.component.ts
@@ -168,7 +168,9 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy {
                     { label: 'EDA Query', value: 'EDA' },
                     { label: 'SQL Query', value: 'SQL' },
                 ];
-            } else if (!standardQueryMode && !treeQueryMode) {
+            }
+            
+            if ((!standardQueryMode && !treeQueryMode) || this.edaPanels.length === 1) {
                 panel.queryModes = [
                     { label: 'EDA Query', value: 'EDA' },
                     { label: 'SQL Query', value: 'SQL' },