diff --git a/gym/views.py b/gym/views.py
index 8d616af..7702532 100644
--- a/gym/views.py
+++ b/gym/views.py
@@ -44,18 +44,20 @@ class RoomDetailView(LoginRequiredMixin, QuickActionsMixin, SessionResetMixin, g
         if self.object.latitude and self.object.longitude:
             from user_agents import parse
             user_agent = parse(self.request.META.get('HTTP_USER_AGENT'))
+
             if user_agent.is_mobile:
-                quick_actions.append({
-                    'url': f"waze://?ll={self.object.latitude},{self.object.longitude}&navigate=yes",
-                    'category': 'info',
-                    'display': 'Waze'
-                })
+                url = f"waze://?ll={self.object.latitude},{self.object.longitude}&navigate=yes"
+                name = 'Waze'
             else:
-                quick_actions.append({
-                    'url': f"https://waze.com/ul?ll={self.object.latitude},{self.object.longitude}",
-                    'category': 'info',
-                    'display': 'Waze'
-                })
+                url = (f"https://www.google.com/maps/place/{self.object.latitude},{self.object.longitude}"
+                       f"/@{self.object.latitude},{self.object.longitude},18z")
+                name = 'Google Maps'
+
+            quick_actions.append({
+                'url': url,
+                'category': 'info',
+                'display': name
+            })
         return quick_actions
 
     def get_context_data(self, **kwargs):