diff --git a/src/openrct2/platform/Windows.cpp b/src/openrct2/platform/Windows.cpp
index 029014dbf4..9ebc13ffc9 100644
--- a/src/openrct2/platform/Windows.cpp
+++ b/src/openrct2/platform/Windows.cpp
@@ -22,6 +22,7 @@
 #    include "../OpenRCT2.h"
 #    include "../Version.h"
 #    include "../config/Config.h"
+#    include "../core/String.h"
 #    include "../localisation/Date.h"
 #    include "../localisation/Language.h"
 #    include "../rct2/RCT2.h"
@@ -268,6 +269,8 @@ std::string platform_sanitise_filename(const std::string& path)
         },
         '_');
 
+    sanitised = String::Trim(sanitised);
+
     return sanitised;
 }
 
diff --git a/test/tests/CMakeLists.txt b/test/tests/CMakeLists.txt
index 842b6e7e54..72a485032d 100644
--- a/test/tests/CMakeLists.txt
+++ b/test/tests/CMakeLists.txt
@@ -144,6 +144,13 @@ target_link_libraries(test_ini ${GTEST_LIBRARIES} test-common ${LDL} z)
 target_link_platform_libraries(test_ini)
 add_test(NAME ini COMMAND test_ini)
 
+# Platform
+add_executable(test_platform ${CMAKE_CURRENT_LIST_DIR}/Platform.cpp)
+SET_CHECK_CXX_FLAGS(test_platform)
+target_link_libraries(test_platform ${GTEST_LIBRARIES} test-common ${LDL} z libopenrct2)
+target_link_platform_libraries(test_platform)
+add_test(NAME platform COMMAND test_platform)
+
 # String test
 set(STRING_TEST_SOURCES
         "${CMAKE_CURRENT_LIST_DIR}/StringTest.cpp"
diff --git a/test/tests/Platform.cpp b/test/tests/Platform.cpp
new file mode 100644
index 0000000000..d8e345c052
--- /dev/null
+++ b/test/tests/Platform.cpp
@@ -0,0 +1,30 @@
+/*****************************************************************************
+ * Copyright (c) 2014-2019 OpenRCT2 developers
+ *
+ * For a complete list of all authors, please refer to contributors.md
+ * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
+ *
+ * OpenRCT2 is licensed under the GNU General Public License version 3.
+ *****************************************************************************/
+
+#include <openrct2/platform/platform.h>
+
+#include <gtest/gtest.h>
+
+TEST(platform, sanitise_filename)
+{
+#ifndef _WIN32
+    ASSERT_EQ("normal-filename.png", platform_sanitise_filename("normal-filename.png"));
+    ASSERT_EQ("utf🎱", platform_sanitise_filename("utf🎱"));
+    ASSERT_EQ("forbidden_char", platform_sanitise_filename("forbidden/char"));
+    ASSERT_EQ("forbidden_\\:\"|?*chars", platform_sanitise_filename("forbidden/\\:\"|?*chars"));
+    ASSERT_EQ(" non trimmed ", platform_sanitise_filename(" non trimmed "));
+#else
+    ASSERT_EQ("normal-filename.png", platform_sanitise_filename("normal-filename.png"));
+    ASSERT_EQ("utf🎱", platform_sanitise_filename("utf🎱"));
+    ASSERT_EQ("forbidden_char", platform_sanitise_filename("forbidden/char"));
+    ASSERT_EQ("forbidden_______chars", platform_sanitise_filename("forbidden/\\:\"|?*chars"));
+    ASSERT_EQ("non trimmed", platform_sanitise_filename(" non trimmed "));
+#endif
+}
+