Fix show dashboard logo in fullscreen mode

@@ -56,7 +56,7 @@
                                [syncStateWithQueryParam]="syncStateWithQueryParam"
                                [syncStateWithQueryParam]="syncStateWithQueryParam"
                                [states]="dashboardConfiguration.states">
                                [states]="dashboardConfiguration.states">
           </tb-states-component>
           </tb-states-component>
-          <img *ngIf="showDashboardLogo() && isFullscreen" [src]="dashboardLogo"
+          <img *ngIf="showDashboardLogo()" [src]="dashboardLogo"
                aria-label="dashboard_logo" class="dashboard_logo"/>
                aria-label="dashboard_logo" class="dashboard_logo"/>
         </div>
         </div>
         <div class="tb-dashboard-action-panel" fxFlex="1 0 auto" fxLayout="row-reverse"
         <div class="tb-dashboard-action-panel" fxFlex="1 0 auto" fxLayout="row-reverse"

@@ -488,7 +488,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
   public showDashboardLogo(): boolean {
   public showDashboardLogo(): boolean {
     if (this.dashboard.configuration.settings &&
     if (this.dashboard.configuration.settings &&
       isDefined(this.dashboard.configuration.settings.showDashboardLogo)) {
       isDefined(this.dashboard.configuration.settings.showDashboardLogo)) {
-      return this.dashboard.configuration.settings.showDashboardLogo;
+      return this.dashboard.configuration.settings.showDashboardLogo && (this.forceFullscreen || this.singlePageMode || this.isFullscreen);
     } else {
     } else {
       return false;
       return false;
     }
     }