diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImagarePlugin.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImagarePlugin.java
index adb638c..240c770 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImagarePlugin.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImagarePlugin.java
@@ -25,6 +25,8 @@
   public void onPluginLoad() {
     Plugin.get().screen("upload", new ImageUploadScreen.Factory());
     Plugin.get().screen("settings", new ImagareAdminScreen.Factory());
-    Plugin.get().screen("preferences", new ImagarePreferenceScreen.Factory());
+    Plugin.get().settingsScreen("preferences",
+        Plugin.get().getName() + " Preferences",
+        new ImagarePreferenceScreen.Factory());
   }
 }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java
index ab9668a..8b4f2c1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java
@@ -56,7 +56,7 @@
     p.setStyleName("imagare-menu-panel");
     Anchor prefsAnchor = new Anchor(new ImageResourceRenderer().render(
         ImagarePlugin.RESOURCES.preferences()),
-        "#/x/" + Plugin.get().getPluginName() + "/preferences");
+        "#/settings/x/" + Plugin.get().getPluginName() + "/preferences");
     prefsAnchor.setTitle("Edit Preferences");
     p.add(prefsAnchor);
     add(p);