diff --git a/Libraries/LibGUI/GFilePicker.cpp b/Libraries/LibGUI/GFilePicker.cpp
index 861a8413d3..323b357106 100644
--- a/Libraries/LibGUI/GFilePicker.cpp
+++ b/Libraries/LibGUI/GFilePicker.cpp
@@ -48,7 +48,7 @@ GFilePicker::GFilePicker(Mode mode, const StringView& path, CObject* parent)
     , m_model(GDirectoryModel::create())
     , m_mode(mode)
 {
-    set_title("GFilePicker");
+    set_title(m_mode == Mode::Open ? "Open File" : "Save File");
     set_rect(200, 200, 700, 400);
     auto* horizontal_container = new GWidget;
     set_main_widget(horizontal_container);
@@ -69,7 +69,7 @@ GFilePicker::GFilePicker(Mode mode, const StringView& path, CObject* parent)
 
     auto* toolbar = new GToolBar(upper_container);
     toolbar->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
-    toolbar->set_preferred_size(60, 0);
+    toolbar->set_preferred_size(85, 0);
     toolbar->set_has_frame(false);
 
     auto* location_textbox = new GTextBox(upper_container);
@@ -95,6 +95,12 @@ GFilePicker::GFilePicker(Mode mode, const StringView& path, CObject* parent)
     });
     toolbar->add_action(*open_parent_directory_action);
 
+    auto go_home_action = GAction::create("Go to Home Directory", GraphicsBitmap::load_from_file("/res/icons/16x16/go-home.png"), [this](auto&) {
+        m_model->open(get_current_user_home_path());
+    });
+    toolbar->add_action(go_home_action);
+    toolbar->add_separator();
+
     auto mkdir_action = GAction::create("New directory...", GraphicsBitmap::load_from_file("/res/icons/16x16/mkdir.png"), [this](const GAction&) {
         GInputBox input_box("Enter name:", "New directory", this);
         if (input_box.exec() == GInputBox::ExecOK && !input_box.text_value().is_empty()) {
@@ -169,6 +175,8 @@ GFilePicker::GFilePicker(Mode mode, const StringView& path, CObject* parent)
     ok_button->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
     ok_button->set_preferred_size(80, 0);
     ok_button->set_text(ok_button_name(m_mode));
+    if (m_mode == Mode::Save)
+        ok_button->set_focus(true);
     ok_button->on_click = [this, filename_textbox](auto&) {
         FileSystemPath path(String::format("%s/%s", m_model->path().characters(), filename_textbox->text().characters()));
 
diff --git a/Libraries/LibGUI/GFilePicker.h b/Libraries/LibGUI/GFilePicker.h
index 97f80bf103..55d394c895 100644
--- a/Libraries/LibGUI/GFilePicker.h
+++ b/Libraries/LibGUI/GFilePicker.h
@@ -1,5 +1,6 @@
 #include <AK/FileSystemPath.h>
 #include <AK/Optional.h>
+#include <LibCore/CUserInfo.h>
 #include <LibGUI/GDialog.h>
 #include <LibGUI/GTableView.h>
 
@@ -18,7 +19,7 @@ public:
     static Optional<String> get_save_filepath();
     static bool file_exists(const StringView& path);
 
-    GFilePicker(Mode type = Mode::Open, const StringView& path = "/", CObject* parent = nullptr);
+    GFilePicker(Mode type = Mode::Open, const StringView& path = String(get_current_user_home_path()), CObject* parent = nullptr);
     virtual ~GFilePicker() override;
 
     FileSystemPath selected_file() const { return m_selected_file; }