diff --git a/config/description.exs b/config/description.exs
index 2755c36f9..e5e7160d4 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -3328,6 +3328,12 @@ config :pleroma, :config_description, [
         description:
           "A map containing available frontends and parameters for their installation.",
         children: frontend_options
+      },
+      %{
+          key: :pickable,
+          type: {:list, :string},
+          description:
+            "A list containing all frontends users can pick as their preference, format is :name/:ref, e.g pleroma-fe/stable."
       }
     ]
   },
diff --git a/lib/pleroma/web/frontend_switcher/frontend_switcher_controller.ex b/lib/pleroma/web/frontend_switcher/frontend_switcher_controller.ex
new file mode 100644
index 000000000..4f3efb3aa
--- /dev/null
+++ b/lib/pleroma/web/frontend_switcher/frontend_switcher_controller.ex
@@ -0,0 +1,20 @@
+defmodule Pleroma.Web.FrontendSwitcher.FrontendSwitcherController do
+  use Pleroma.Web, :controller
+  alias Pleroma.Config
+
+  @doc "GET /frontend_switcher"
+  def switch(conn, _params) do
+    pickable = Config.get([:frontends, :pickable], [])
+
+    conn
+    |> put_view(Pleroma.Web.FrontendSwitcher.FrontendSwitcherView)
+    |> render("switch.html", choices: pickable)
+  end
+
+  @doc "POST /frontend_switcher"
+  def do_switch(conn, params) do
+    conn
+    |> put_resp_cookie("preferred_frontend", params["frontend"])
+    |> html("<meta http-equiv=\"refresh\" content=\"0; url=/\">")
+  end
+end
diff --git a/lib/pleroma/web/frontend_switcher/frontend_switcher_view.ex b/lib/pleroma/web/frontend_switcher/frontend_switcher_view.ex
new file mode 100644
index 000000000..e57e4e10b
--- /dev/null
+++ b/lib/pleroma/web/frontend_switcher/frontend_switcher_view.ex
@@ -0,0 +1,3 @@
+defmodule Pleroma.Web.FrontendSwitcher.FrontendSwitcherView do
+  use Pleroma.Web, :view
+end
diff --git a/lib/pleroma/web/plugs/frontend_static.ex b/lib/pleroma/web/plugs/frontend_static.ex
index 179f2bd47..3708e9e4a 100644
--- a/lib/pleroma/web/plugs/frontend_static.ex
+++ b/lib/pleroma/web/plugs/frontend_static.ex
@@ -49,6 +49,7 @@ defmodule Pleroma.Web.Plugs.FrontendStatic do
   end
 
   def call(conn, opts) do
+    IO.inspect("OPTS: #{inspect(opts)}")
     with false <- api_route?(conn.path_info),
          false <- invalid_path?(conn.path_info),
          fallback_frontend_type <- Map.get(opts, :frontend_type, :primary),
@@ -69,16 +70,26 @@ defmodule Pleroma.Web.Plugs.FrontendStatic do
     Map.get(cookies, @frontend_cookie_name)
   end
 
-  def preferred_or_fallback(conn, fallback) do
+  # Only override primary frontend
+  def preferred_or_fallback(conn, :primary) do
     case preferred_frontend(conn) do
       nil ->
-        fallback
+        :primary
 
       frontend ->
         frontend
     end
   end
 
+<<<<<<< HEAD
+=======
+  def preferred_or_fallback(conn, fallback), do: fallback
+
+  defp enabled?(if_opt) when is_function(if_opt), do: if_opt.()
+  defp enabled?(true), do: true
+  defp enabled?(_), do: false
+
+>>>>>>> de64c6c54a (add selection UI)
   defp invalid_path?(list) do
     invalid_path?(list, :binary.compile_pattern(["/", "\\", ":", "\0"]))
   end
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index a8636cfba..7658f8509 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -637,11 +637,6 @@ defmodule Pleroma.Web.Router do
   end
 
   scope "/api/v1/pleroma", Pleroma.Web.MastodonAPI do
-    pipe_through(:api)
-    get("/accounts/:id/endorsements", AccountController, :endorsements)
-  end
-
-  scope "/api/v2/pleroma", Pleroma.Web.PleromaAPI do
     scope [] do
       pipe_through(:authenticated_api)
       get("/chats", ChatController, :index2)
@@ -901,7 +896,11 @@ defmodule Pleroma.Web.Router do
 
   scope "/", Pleroma.Web do
     pipe_through(:browser)
+
     get("/mailer/unsubscribe/:token", Mailer.SubscriptionController, :unsubscribe)
+
+    get("/frontend_switcher", FrontendSwitcher.FrontendSwitcherController, :switch)
+    post("/frontend_switcher", FrontendSwitcher.FrontendSwitcherController, :do_switch)
   end
 
   pipeline :ap_service_actor do
diff --git a/lib/pleroma/web/templates/frontend_switcher/switch.html.eex b/lib/pleroma/web/templates/frontend_switcher/switch.html.eex
new file mode 100644
index 000000000..0692ddfb8
--- /dev/null
+++ b/lib/pleroma/web/templates/frontend_switcher/switch.html.eex
@@ -0,0 +1,7 @@
+<h2>Switch Frontend</h2>
+
+<%= form_for @conn, Routes.frontend_switcher_path(@conn, :do_switch), fn f -> %>
+  <%= select(f, :frontend, @choices) %>
+
+  <%= submit do: "submit" %>
+<% end %>