diff --git a/public/app/features/panel/query_editor_row.ts b/public/app/features/panel/query_editor_row.ts
index 76bdd6d8539..8249d84774f 100644
--- a/public/app/features/panel/query_editor_row.ts
+++ b/public/app/features/panel/query_editor_row.ts
@@ -29,6 +29,10 @@ export class QueryRowCtrl {
       delete this.target.isNew;
       this.toggleCollapse(false);
     }
+
+    if (this.panel.targets.length < 4) {
+      this.collapsed = false;
+    }
   }
 
   toggleHideQuery() {