diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 7acbd6c2a2..fef29535bd 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -3440,7 +3440,7 @@ WinMain (struct HINSTANCE__ *hInstance,
     comm_ctrl.dwICC = ICC_WIN95_CLASSES;
     InitCommonControlsEx(&comm_ctrl);
 
-    /* RichEd20.DLL is needed for filter entries. */
+    /* RichEd20.DLL is needed for native file dialog filter entries. */
     ws_load_library("riched20.dll");
 
     set_has_console(FALSE);
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 20c81e578b..c3f027bc62 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -65,10 +65,12 @@
 #include "ui/software_update.h"
 #include "ui/last_open_dir.h"
 #include "ui/recent_utils.h"
-#include <wsutil/utf8_entities.h>
+
+#include "wsutil/utf8_entities.h"
 
 #ifdef _WIN32
 #  include "ui/win32/console_win32.h"
+#  include "wsutil/file_util.h"
 #endif /* _WIN32 */
 
 #include <QAction>
@@ -85,11 +87,6 @@
 #include <QUrl>
 #include <QColorDialog>
 
-#ifdef Q_OS_WIN
-#include <QDebug>
-#include <QLibrary>
-#endif
-
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
@@ -558,13 +555,7 @@ WiresharkApplication::WiresharkApplication(int &argc,  char **argv) :
 
 #ifdef Q_OS_WIN
     /* RichEd20.DLL is needed for native file dialog filter entries. */
-    if (QLibrary::isLibrary("riched20.dll")) {
-        QLibrary riched20("riched20.dll");
-        riched20.load();
-        if (!riched20.isLoaded()) {
-            qDebug() << riched20.errorString();
-        }
-    }
+    ws_load_library("riched20.dll");
 #endif // Q_OS_WIN
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0))