diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index 38094db291..e7477171f6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -956,18 +956,7 @@
                                     <a class="dropdown-item" href="#" id="marcTagsSelect"><i class="fa fa-check-square"></i> Show tags</a>
                                 </li>
                             [% END %]
-                            <li><h6 class="dropdown-header">Change framework</h6></li>
-                            <li>
-                                <a class="dropdown-item change-framework" href="#" data-frameworkcode="">
-                                    [% IF ( frameworkcode ) %]
-                                       <i class="fa fa-fw">&nbsp;</i>
-                                    [% ELSE %]
-                                        <i class="fa fa-fw fa-check"></i>
-                                    [% END %]
-                                    Default
-                                </a>
-                            </li>
-                            [% FOREACH framework IN frameworks%]
+                            [% BLOCK framework_link %]
                                 <li>
                                     <a class="dropdown-item change-framework" href="#" data-frameworkcode="[% framework.frameworkcode | html %]">
                                         [% IF framework.frameworkcode == frameworkcode %]
@@ -975,10 +964,23 @@
                                         [% ELSE %]
                                             <i class="fa fa-fw">&nbsp;</i>
                                         [% END %]
-                                        [% framework.frameworktext | html %]
+                                        [% !framework ? 'Default' : framework.frameworktext | html %]
                                     </a>
                                 </li>
                             [% END %]
+                            [% IF CAN_user_editcatalogue_edit_catalogue %]
+                                <li><h6 class="dropdown-header">Change framework</h6></li>
+                                [% FOREACH framework IN frameworks %]
+                                    [% IF loop.first %][% INCLUDE framework_link framework='' %][% END %]
+                                    [% IF !framework.is_fast_add %][% INCLUDE framework_link %][% END %]
+                                [% END %]
+                            [% END %]
+                            [% IF CAN_user_editcatalogue_fast_cataloging %]
+                                <li><h6 class="dropdown-header">Change Fast Add framework</h6></li>
+                                [% FOREACH framework IN frameworks %]
+                                    [% IF framework.is_fast_add %][% INCLUDE framework_link %][% END %]
+                                [% END %]
+                            [% END %]
                         </ul> <!-- /#settings-menu -->
                     </div> <!-- /.btn-group -->
                     [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
index 3cd9762937..70def89ebc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
@@ -39,7 +39,11 @@
                 <ul class="dropdown-menu dropdown-menu-end">
                     <li><a class="dropdown-item" id="newRecordDefault" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li>
                     [% FOREACH framework IN frameworks %]
-                        <li><a class="dropdown-item" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% framework.frameworktext | html %]</a></li>
+                        [% IF !framework.is_fast_add %]<li><a class="dropdown-item" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% framework.frameworktext | html %]</a></li>[% END %]
+                    [% END %]
+                    [% FOREACH framework IN frameworks %]
+                        [% IF loop.first %]<li><h6 class="dropdown-header">Fast add frameworks</h6></li>[% END %]
+                        [% IF framework.is_fast_add %]<li><a class="dropdown-item" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% framework.frameworktext | html %]</a></li>[% END %]
                     [% END %]
                 </ul>
             </div>
@@ -50,7 +54,11 @@
                     <ul class="dropdown-menu dropdown-menu-end">
                         <li id="Default" class="z3950searchFw"><a class="dropdown-item" href="#">Default framework</a></li>
                         [% FOREACH framework IN frameworks %]
-                            <li id="[% framework.frameworkcode | html %]" class="z3950searchFw"><a class="dropdown-item" href="#">[% framework.frameworktext | html %]</a></li>
+                            [% IF !framework.is_fast_add %]<li id="[% framework.frameworkcode | html %]" class="z3950searchFw"><a class="dropdown-item" href="#">[% framework.frameworktext | html %]</a></li>[% END %]
+                        [% END %]
+                        [% FOREACH framework IN frameworks %]
+                            [% IF loop.first %]<li><h6 class="dropdown-header">Fast add frameworks</h6></li>[% END %]
+                            [% IF framework.is_fast_add %]<li id="[% framework.frameworkcode | html %]" class="z3950searchFw"><a class="dropdown-item" href="#">[% framework.frameworktext | html %]</a></li>[% END %]
                         [% END %]
                     </ul>
                 </div>