diff --git a/gtk/OptionsDialog.cc b/gtk/OptionsDialog.cc
index af6355d1d..a07fea41a 100644
--- a/gtk/OptionsDialog.cc
+++ b/gtk/OptionsDialog.cc
@@ -262,7 +262,7 @@ OptionsDialog::OptionsDialog(
     Gtk::Window& parent,
     Glib::RefPtr<Session> const& core,
     std::unique_ptr<tr_ctor, void (*)(tr_ctor*)> ctor)
-    : Gtk::Dialog(_("Torrent Options"), parent)
+    : Gtk::Dialog(_("Torrent Options"), parent, true /* modal */)
     , impl_(std::make_unique<Impl>(*this, core, std::move(ctor)))
 {
 }
@@ -438,6 +438,8 @@ std::unique_ptr<TorrentFileChooserDialog> TorrentFileChooserDialog::create(
 TorrentFileChooserDialog::TorrentFileChooserDialog(Gtk::Window& parent, Glib::RefPtr<Session> const& core)
     : Gtk::FileChooserDialog(parent, _("Open a Torrent"), Gtk::FILE_CHOOSER_ACTION_OPEN)
 {
+    set_modal(true);
+
     add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
     add_button(_("_Open"), Gtk::RESPONSE_ACCEPT);
 
@@ -496,7 +498,7 @@ std::unique_ptr<TorrentUrlChooserDialog> TorrentUrlChooserDialog::create(Gtk::Wi
 }
 
 TorrentUrlChooserDialog::TorrentUrlChooserDialog(Gtk::Window& parent, Glib::RefPtr<Session> const& core)
-    : Gtk::Dialog(_("Open URL"), parent)
+    : Gtk::Dialog(_("Open URL"), parent, true /* modal  */)
 {
     guint row;
 
diff --git a/gtk/PrefsDialog.cc b/gtk/PrefsDialog.cc
index b5a377509..1e89991f0 100644
--- a/gtk/PrefsDialog.cc
+++ b/gtk/PrefsDialog.cc
@@ -1092,6 +1092,7 @@ PrefsDialog::PrefsDialog(Gtk::Window& parent, Glib::RefPtr<Session> const& core)
     : Gtk::Dialog(_("Transmission Preferences"), parent)
     , impl_(std::make_unique<Impl>(*this, core))
 {
+    set_modal(true);
 }
 
 PrefsDialog::~PrefsDialog() = default;
diff --git a/gtk/transmission-ui.xml b/gtk/transmission-ui.xml
index 8fa582260..f8f482573 100644
--- a/gtk/transmission-ui.xml
+++ b/gtk/transmission-ui.xml
@@ -10,6 +10,7 @@
           <attribute name="action">win.open-torrent</attribute>
           <attribute name="icon">document-open</attribute>
           <attribute name="label" translatable="yes">_Open</attribute>
+          <attribute name="accel">&lt;control&gt;O</attribute>
           <attribute name="tooltip" translatable="yes">Open a torrent</attribute>
         </item>
         <item>