diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index 8996b3351..be6b954ad 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -62,6 +62,8 @@
   <!-- TODO Deferring jQuery is causing scripts to be loaded before jQuery is available -->
   <script type="text/javascript" src="{% static '/javascript/jquery/jquery.min.js' %}"></script>
   <!-- Local link to system Bootstrap JS -->
+  <script type="text/javascript" src="{% static '/javascript/popper.js/umd/popper.js' %}" defer></script>
+  <script type="text/javascript" src="{% static 'theme/js/fix.js' %}" defer></script>
   <script type="text/javascript" src="{% static '/javascript/bootstrap5/js/bootstrap.bundle.min.js' %}" defer></script>
 
   <script type="text/javascript" src="{% static 'theme/js/main.js' %}" defer></script>
diff --git a/static/themes/default/js/fix.js b/static/themes/default/js/fix.js
new file mode 100644
index 000000000..12e49dd23
--- /dev/null
+++ b/static/themes/default/js/fix.js
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+/*
+  This file is part of FreedomBox.
+
+  @licstart  The following is the entire license notice for the
+  JavaScript code in this page.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+  @licend  The above is the entire license notice
+  for the JavaScript code in this page.
+*/
+
+// Workaround Debian bug #1087969. popper.js 2.x is needed for Bootstrap 5,
+// however, the current version on in Debian is 1.x.
+if (typeof(Popper.createPopper) === 'undefined') {
+    window.Popper.createPopper = function(reference, popper, options) {
+        if (options.modifiers.length == 1) {
+            // Navbar dropdown
+            options.modifiers = {
+                'applyStyle': {'enabled': false}
+            };
+        } else {
+            // Regular dropdown
+            options.modifiers = {
+                'flip': {'enabled': true},
+                'offset': {'offset': 0},
+                'preventOverflow': {'boundariesElement': 'scrollParent'}
+            };
+        }
+        return new Popper(reference, popper, options);
+    };
+}