diff --git a/src/chat_control.py b/src/chat_control.py
index b19c3a013..b21cb7aa5 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -1630,6 +1630,12 @@ class ChatControl(ChatControlBase):
         id_ = widget.connect('button-release-event',
             self.on_location_eventbox_button_release_event)
         self.handlers[id_] = widget
+        id_ = widget.connect('enter-notify-event',
+            self.on_location_eventbox_enter_notify_event)
+        self.handlers[id_] = widget
+        id_ = widget.connect('leave-notify-event',
+            self.on_location_eventbox_leave_notify_event)
+        self.handlers[id_] = widget
 
         for key in ('1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'):
             widget = self.xml.get_object(key + '_button')
@@ -2064,6 +2070,17 @@ class ChatControl(ChatControlBase):
                         'lon': location['lon']}
                 helpers.launch_browser_mailer('url', uri)
 
+    def on_location_eventbox_leave_notify_event(self, widget, event):
+        """
+        Just moved the mouse so show the cursor
+        """
+        cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)
+        self.parent_win.window.window.set_cursor(cursor)
+
+    def on_location_eventbox_enter_notify_event(self, widget, event):
+        cursor = gtk.gdk.Cursor(gtk.gdk.HAND2)
+        self.parent_win.window.window.set_cursor(cursor)
+
     def _on_window_motion_notify(self, widget, event):
         """
         It gets called no matter if it is the active window or not