diff --git a/lib/Screens/circuit.dart b/lib/Screens/circuit.dart
index 1be3297..a07b86e 100644
--- a/lib/Screens/circuit.dart
+++ b/lib/Screens/circuit.dart
@@ -127,6 +127,7 @@ class CircuitScreen extends StatelessWidget {
                               CircuitMapScreen(
                                 race.circuitId,
                               ),
+                              isDialog: true,
                             ),
                             snapshot.data!['raceResults'] != null &&
                                     snapshot.data!['raceResults'].isNotEmpty
@@ -245,6 +246,7 @@ class CircuitScreen extends StatelessWidget {
                                           CircuitMapScreen(
                                             race.circuitId,
                                           ),
+                                          isDialog: false,
                                         ),
                                         snapshot.data!['raceResults'] != null &&
                                                 snapshot.data!['raceResults']
diff --git a/lib/helpers/buttons.dart b/lib/helpers/buttons.dart
index 74ee282..3caa2c3 100644
--- a/lib/helpers/buttons.dart
+++ b/lib/helpers/buttons.dart
@@ -23,10 +23,12 @@ class BoxBoxButton extends StatelessWidget {
   final String title;
   final Icon icon;
   final Widget destination;
+  final bool isDialog;
   const BoxBoxButton(
     this.title,
     this.icon,
     this.destination, {
+    this.isDialog = false,
     super.key,
   });
 
@@ -60,12 +62,17 @@ class BoxBoxButton extends StatelessWidget {
             ),
           ),
         ),
-        onTap: () => Navigator.push(
-          context,
-          MaterialPageRoute(
-            builder: (context) => destination,
-          ),
-        ),
+        onTap: () => isDialog
+            ? showDialog(
+                context: context,
+                builder: (BuildContext context) => destination,
+              )
+            : Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => destination,
+                ),
+              ),
       ),
     );
   }