diff --git a/src/app/core/components/widget/widget.component.scss b/src/app/core/components/widget/widget.component.scss
index 7fbc6f26..d5d54a89 100644
--- a/src/app/core/components/widget/widget.component.scss
+++ b/src/app/core/components/widget/widget.component.scss
@@ -40,7 +40,7 @@ fuse-widget {
         transform: rotateY(180deg);
         backface-visibility: hidden;
 
-        .fuse-widget-flip-button {
+        [fuseWidgetToggle] {
             position: absolute;
             top: 0;
             right: 0;
diff --git a/src/app/core/components/widget/widget.component.ts b/src/app/core/components/widget/widget.component.ts
index 0588c76e..e92e07e6 100644
--- a/src/app/core/components/widget/widget.component.ts
+++ b/src/app/core/components/widget/widget.component.ts
@@ -11,6 +11,7 @@ import { FuseWidgetToggleDirective } from './widget-toggle.directive';
 export class FuseWidgetComponent implements OnInit, AfterContentInit
 {
     @HostBinding('class.flipped') flipped = false;
+    @ContentChildren(FuseWidgetToggleDirective, {descendants: true}) toggleButtons: QueryList<FuseWidgetToggleDirective>;
 
     constructor(private el: ElementRef, private renderer: Renderer2)
     {
@@ -25,10 +26,8 @@ export class FuseWidgetComponent implements OnInit, AfterContentInit
     {
         setTimeout(() => {
 
-            const flipButtons = this.el.nativeElement.querySelectorAll('.fuse-widget-flip-button');
-
-            flipButtons.forEach(flipButton => {
-                this.renderer.listen(flipButton, 'click', () => {
+            this.toggleButtons.forEach(flipButton => {
+                this.renderer.listen(flipButton.el.nativeElement, 'click', () => {
                     this.toggle();
                 });
             });
diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html
index ae277f07..59022f4d 100644
--- a/src/app/main/content/apps/dashboards/project/project.component.html
+++ b/src/app/main/content/apps/dashboards/project/project.component.html
@@ -57,7 +57,7 @@
                                             </md-option>
                                         </md-select>
 
-                                        <button md-icon-button class="fuse-widget-flip-button" aria-label="more">
+                                        <button md-icon-button fuseWidgetToggle aria-label="more">
                                             <md-icon>more_vert</md-icon>
                                         </button>
 
@@ -79,7 +79,7 @@
 
                                 <!-- Back -->
                                 <div class="fuse-widget-back p-16 pt-32 md-white-bg mat-elevation-z2">
-                                    <button md-icon-button class="fuse-widget-flip-button" ng-click="flipWidget()" aria-label="Flip widget">
+                                    <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button" ng-click="flipWidget()" aria-label="Flip widget">
                                         <md-icon class="s-16">close</md-icon>
                                     </button>
 
@@ -100,7 +100,7 @@
                                     <div class="pl-16 pr-8 py-16 h-52" fxLayout="row" fxLayoutAlign="space-between center">
                                         <div class="h3">{{widgets.widget2.title}}</div>
 
-                                        <button md-icon-button class="fuse-widget-flip-button" aria-label="more">
+                                        <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button" aria-label="more">
                                             <md-icon>more_vert</md-icon>
                                         </button>
                                     </div>
@@ -121,7 +121,7 @@
 
                                 <!-- Back -->
                                 <div class="fuse-widget-back p-16 pt-32 md-white-bg mat-elevation-z2">
-                                    <button md-icon-button class="fuse-widget-flip-button" ng-click="flipWidget()" aria-label="Flip widget">
+                                    <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button" ng-click="flipWidget()" aria-label="Flip widget">
                                         <md-icon class="s-16">close</md-icon>
                                     </button>
 
@@ -142,7 +142,7 @@
                                     <div class="pl-16 pr-8 py-16 h-52" fxLayout="row" fxLayoutAlign="space-between center">
                                         <div class="h3">{{widgets.widget3.title}}</div>
 
-                                        <button md-icon-button class="fuse-widget-flip-button" aria-label="more">
+                                        <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button" aria-label="more">
                                             <md-icon>more_vert</md-icon>
                                         </button>
                                     </div>
@@ -163,7 +163,7 @@
 
                                 <!-- Back -->
                                 <div class="fuse-widget-back p-16 pt-32 md-white-bg mat-elevation-z2">
-                                    <button md-icon-button class="fuse-widget-flip-button" ng-click="flipWidget()" aria-label="Flip widget">
+                                    <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button" ng-click="flipWidget()" aria-label="Flip widget">
                                         <md-icon class="s-16">close</md-icon>
                                     </button>
 
@@ -184,7 +184,7 @@
                                     <div class="pl-16 pr-8 py-16 h-52" fxLayout="row" fxLayoutAlign="space-between center">
                                         <div class="h3">{{widgets.widget4.title}}</div>
 
-                                        <button md-icon-button class="fuse-widget-flip-button" aria-label="more">
+                                        <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button" aria-label="more">
                                             <md-icon>more_vert</md-icon>
                                         </button>
                                     </div>
@@ -204,7 +204,7 @@
 
                                 <!-- Back -->
                                 <div class="fuse-widget-back p-16 pt-32 md-white-bg mat-elevation-z2">
-                                    <button md-icon-button class="fuse-widget-flip-button" ng-click="flipWidget()" aria-label="Flip widget">
+                                    <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button" ng-click="flipWidget()" aria-label="Flip widget">
                                         <md-icon class="s-16">close</md-icon>
                                     </button>