diff --git a/indra/newview/linux_tools/refresh_desktop_app_entry.sh b/indra/newview/linux_tools/refresh_desktop_app_entry.sh
index 88ec152fa9e3c09d31d91c9a39e213c9faf2e3ea..2c8d3fe29714787f936eca867a35558c02343dec 100755
--- a/indra/newview/linux_tools/refresh_desktop_app_entry.sh
+++ b/indra/newview/linux_tools/refresh_desktop_app_entry.sh
@@ -45,7 +45,7 @@ PrefersNonDefaultGPU=false
 [Desktop Action AssociateMIME]
 Exec=${installation_prefix}/etc/register_secondlifeprotocol.sh
 Name=Associate SLURLs
-Comment=Set this viewer as the default handler for secondlife:// links.
+Comment=Set this viewer as the default handler for secondlife:// and hop:// links.
 desktopfile
 
 #The above adds some options when the shortcut is right-clicked, to launch on the default (usually integrated) GPU, and to force MIME type association.
diff --git a/indra/newview/linux_tools/register_secondlifeprotocol.sh b/indra/newview/linux_tools/register_secondlifeprotocol.sh
index 06dd1278174dd865d00c5774a45fed6aff3cb229..d38cc29704942875ad4e0f2c707bae4dce556c0f 100755
--- a/indra/newview/linux_tools/register_secondlifeprotocol.sh
+++ b/indra/newview/linux_tools/register_secondlifeprotocol.sh
@@ -29,14 +29,14 @@ if command -v xdg-mime query default x-scheme-handler/secondlife >/dev/null 2>&1
 	cat >"${handlerpath}" <<EOFnew || print "Warning: Did not register secondlife:// handler with xdg-mime: Could not write $newhandler"s
 [Desktop Entry]
 Version=1.4
-Name="Second Life URL handler"
-Comment="secondlife:// URL handler"
+Name="Second Life and OpenSim URL handler"
+Comment="secondlife:// and hop:// URL handler"
 Type=Application
 Exec=$desired_handler %u
 Terminal=false
 StartupNotify=true
 NoDisplay=true
-MimeType=x-scheme-handler/secondlife
+MimeType=x-scheme-handler/secondlife;x-scheme-handler/hop;x-scheme-handler/x-grid-info;x-scheme-handler/x-grid-location-info;
 EOFnew
 
 	# TODO: use absolute path for the desktop file
@@ -55,7 +55,7 @@ EOFnew
 			print "SLURL Handler has not changed, leaving as-is."
 		fi
 	fi
-	xdg-mime default "${newhandler}" x-scheme-handler/secondlife
+	xdg-mime default "${newhandler}" x-scheme-handler/secondlife x-scheme-handler/hop x-scheme-handler/x-grid-info x-scheme-handler/x-grid-location-info
 	if command -v update-desktop-database >/dev/null 2>&1; then
 		update-desktop-database "${localappdir}"
 		print "Registered ${desired_handler} as secondlife:// protocol handler with xdg-mime."