diff --git a/bb/manage.cpp b/bb/manage.cpp
index c000383fd..63e43f49f 100644
--- a/bb/manage.cpp
+++ b/bb/manage.cpp
@@ -176,7 +176,7 @@ std::string bible_manage (void* webserver_request)
   for (const auto& bible : bibles) {
     pugi::xml_node li_node = document.append_child ("li");
     pugi::xml_node a_node = li_node.append_child("a");
-    const std::string href = filter_url_build_http_query ("settings", "bible", bible);
+    const std::string href = filter_url_build_http_query ("settings", "bible", filter_url_urlencode(bible));
     a_node.append_attribute("href") = href.c_str();
     a_node.text().set(bible.c_str());
   }
diff --git a/bb/settings.cpp b/bb/settings.cpp
index b6154bf95..39a64aee8 100644
--- a/bb/settings.cpp
+++ b/bb/settings.cpp
@@ -94,6 +94,7 @@ string bible_settings (void * webserver_request)
   if (bible.empty()) bible = request->post ["val1"];
   bible = access_bible::clamp (request, bible);
   view.set_variable ("bible", filter::strings::escape_special_xml_characters (bible));
+  view.set_variable ("urlbible", filter_url_urlencode(filter::strings::escape_special_xml_characters (bible)));
 
   
   // Whether the user has write access to this Bible.
@@ -315,8 +316,6 @@ string bible_settings (void * webserver_request)
   } else {
     view.enable_zone ("server");
   }
-  
-  
 
   
   page += view.render ("bb", "settings");
diff --git a/bb/settings.html b/bb/settings.html
index 5871bdd1b..34367c7d5 100644
--- a/bb/settings.html
+++ b/bb/settings.html
@@ -32,7 +32,7 @@ <h1>translate("Bible") ##bible##</h1>
 <!-- #BEGINZONE manager -->
 <!-- #BEGINZONE write_access -->
 <!-- #BEGINZONE server -->
-    <p><a href="manage?delete=##bible##">translate("Delete this Bible")</a></p>
+    <p><a href="manage?delete=##urlbible##">translate("Delete this Bible")</a></p>
     <p><a href="/resource/bb2resource?bible=##bible##">translate("Convert to USFM resource")</a></p>
 <!-- #ENDZONE server -->
 <!-- #ENDZONE write_access -->
diff --git a/help/changelog.html b/help/changelog.html
index 506f93927..cc8156c75 100644
--- a/help/changelog.html
+++ b/help/changelog.html
@@ -1,5 +1,6 @@
 <h1>ChangeLog</h1>
 
+<p>5.1.010: Can remove a Bible with trailing spaces in its name.</p>
 <p>5.1.010: Support for USFM marker \sup for superscript text.</p>
 <p>5.1.009: Downloading exports in the Windows app works again.</p>
 <p>5.1.009: Finding text in the Windows app user interface works again.</p>