diff --git a/Applications/TextEditor/main.cpp b/Applications/TextEditor/main.cpp
index 55e0651b0c..24315d3239 100644
--- a/Applications/TextEditor/main.cpp
+++ b/Applications/TextEditor/main.cpp
@@ -63,7 +63,7 @@ int main(int argc, char** argv)
     auto open_action = GAction::create("Open document", { Mod_Ctrl, Key_O }, GraphicsBitmap::load_from_file("/res/icons/16x16/open.png"), [window, text_editor, &path](const GAction&) {
         GFilePicker picker;
         if (picker.exec() == GDialog::ExecOK) {
-            path = picker.selected_file();
+            path = picker.selected_file().string();
             open_sesame(*window, *text_editor, path);
         }
     });
diff --git a/LibGUI/GFilePicker.cpp b/LibGUI/GFilePicker.cpp
index b977904d20..0355b4f22d 100644
--- a/LibGUI/GFilePicker.cpp
+++ b/LibGUI/GFilePicker.cpp
@@ -125,7 +125,7 @@ GFilePicker::GFilePicker(const String& path, CObject* parent)
     ok_button->set_text("OK");
     ok_button->on_click = [this, filename_textbox] (auto&) {
         FileSystemPath path(String::format("%s/%s", m_model->path().characters(), filename_textbox->text().characters()));
-        m_selected_file = path.string();
+        m_selected_file = path;
         done(ExecOK);
     };
 }
diff --git a/LibGUI/GFilePicker.h b/LibGUI/GFilePicker.h
index 632c0b2ff5..bd6c3c4bd6 100644
--- a/LibGUI/GFilePicker.h
+++ b/LibGUI/GFilePicker.h
@@ -1,3 +1,4 @@
+#include <AK/FileSystemPath.h>
 #include <LibGUI/GDialog.h>
 #include <LibGUI/GTableView.h>
 
@@ -9,12 +10,12 @@ public:
     virtual ~GFilePicker() override;
 
     // TODO: Should this return a FileSystemPath instead?
-    String selected_file() const { return m_selected_file; }
+    FileSystemPath selected_file() const { return m_selected_file; }
 
     virtual const char* class_name() const override { return "GFilePicker"; }
 
 private:
     GTableView* m_view { nullptr };
     Retained<GDirectoryModel> m_model;
-    String m_selected_file;
+    FileSystemPath m_selected_file;
 };