diff --git a/onionshare/web.py b/onionshare/web.py
index d11924b5..8d80810b 100644
--- a/onionshare/web.py
+++ b/onionshare/web.py
@@ -266,6 +266,8 @@ class Web(object):
         """
 
         def index_logic():
+            self.add_request(self.REQUEST_LOAD, request.path)
+
             r = make_response(render_template(
                 'receive.html',
                 slug=self.slug,
diff --git a/onionshare_gui/mode.py b/onionshare_gui/mode.py
index cca2254d..656f912c 100644
--- a/onionshare_gui/mode.py
+++ b/onionshare_gui/mode.py
@@ -303,7 +303,8 @@ class Mode(QtWidgets.QWidget):
         """
         Handle REQUEST_RATE_LIMIT event.
         """
-        pass
+        self.stop_server()
+        Alert(self.common, strings._('error_rate_limit'), QtWidgets.QMessageBox.Critical)
 
     def handle_request_progress(self, event):
         """
diff --git a/onionshare_gui/receive_mode/__init__.py b/onionshare_gui/receive_mode/__init__.py
index 5b65a052..bf661d86 100644
--- a/onionshare_gui/receive_mode/__init__.py
+++ b/onionshare_gui/receive_mode/__init__.py
@@ -93,6 +93,12 @@ class ReceiveMode(Mode):
         self.starting_server_step3.emit()
         self.start_server_finished.emit()
     
+    def handle_request_load(self, event):
+        """
+        Handle REQUEST_LOAD event.
+        """
+        self.system_tray.showMessage(strings._('systray_page_loaded_title', True), strings._('systray_upload_page_loaded_message', True))
+    
     def handle_request_close_server(self, event):
         """
         Handle REQUEST_CLOSE_SERVER event.
diff --git a/onionshare_gui/share_mode/__init__.py b/onionshare_gui/share_mode/__init__.py
index 15ba2f18..ea02340e 100644
--- a/onionshare_gui/share_mode/__init__.py
+++ b/onionshare_gui/share_mode/__init__.py
@@ -244,7 +244,7 @@ class ShareMode(Mode):
         """
         Handle REQUEST_LOAD event.
         """
-        self.status_bar.showMessage(strings._('download_page_loaded', True))
+        self.system_tray.showMessage(strings._('systray_page_loaded_title', True), strings._('systray_download_page_loaded_message', True))
 
     def handle_request_download(self, event):
         """
@@ -258,13 +258,6 @@ class ShareMode(Mode):
 
         self.system_tray.showMessage(strings._('systray_download_started_title', True), strings._('systray_download_started_message', True))
 
-    def handle_request_rate_limit(self, event):
-        """
-        Handle REQUEST_RATE_LIMIT event.
-        """
-        self.stop_server()
-        Alert(self.common, strings._('error_rate_limit'), QtWidgets.QMessageBox.Critical)
-
     def handle_request_progress(self, event):
         """
         Handle REQUEST_PROGRESS event.
diff --git a/share/locale/en.json b/share/locale/en.json
index 08678747..b6bd4f88 100644
--- a/share/locale/en.json
+++ b/share/locale/en.json
@@ -14,7 +14,6 @@
     "not_a_readable_file": "{0:s} is not a readable file.",
     "no_filenames": "You must specify a list of files to share.",
     "no_available_port": "Could not start the Onion service as there was no available port.",
-    "download_page_loaded": "Download page loaded",
     "other_page_loaded": "Address loaded",
     "close_on_timeout": "Stopped because timer expired",
     "closing_automatically": "Stopped because download finished",
@@ -181,5 +180,8 @@
     "gui_settings_receive_allow_receiver_shutdown_checkbox": "Allow people who upload files to you to stop Receive Mode for you",
     "gui_settings_receive_public_mode_checkbox": "Receive Mode is open to the public\n(don't try to prevent people from guessing the OnionShare address)",
     "systray_close_server_title": "OnionShare Server Closed",
-    "systray_close_server_message": "The user closed the server"
+    "systray_close_server_message": "A user closed the server",
+    "systray_page_loaded_title": "OnionShare Page Loaded",
+    "systray_download_page_loaded_message": "A user loaded the download page",
+    "systray_upload_page_loaded_message": "A user loaded the upload page"
 }