diff --git a/indra/newview/llexternaleditor.cpp b/indra/newview/llexternaleditor.cpp
index b0d88159c1579ac3f59a11f753ce1df876e58fbe..660d955bef32d618725116c8d2e248e98fcc1ba9 100644
--- a/indra/newview/llexternaleditor.cpp
+++ b/indra/newview/llexternaleditor.cpp
@@ -44,8 +44,21 @@ LLExternalEditor::EErrorCode LLExternalEditor::setCommand(const std::string& env
 	std::string cmd = findCommand(env_var, override);
 	if (cmd.empty())
 	{
-		LL_WARNS() << "Editor command is empty or not set" << LL_ENDL;
-		return EC_NOT_SPECIFIED;
+		LL_WARNS() << "Editor command is empty or not set, falling back to OS-specific open handler" << LL_ENDL;
+#if LL_WINDOWS
+		static std::string comspec = getenv("COMSPEC");
+		static const std::string os_cmd = comspec.append(" /C START \"%s\"");
+#elif LL_DARWIN
+		static const std::string os_cmd = "/usr/bin/open \"%s\"";
+#elif LL_LINUX
+		static const std::string os_cmd = "/usr/bin/xdg-open \"%s\"";
+#endif
+		cmd = findCommand("", os_cmd);
+		if (cmd.empty())
+		{
+			LL_WARNS() << "Failed to find the OS-specific open handler \"" << cmd << "\"" << LL_ENDL;
+			return EC_NOT_SPECIFIED;
+		}
 	}
 
 	string_vec_t tokens;