diff --git a/core/ui/ControlPanel/Modals/AddPlugins.tid b/core/ui/ControlPanel/Modals/AddPlugins.tid
index 59ce0cd91..a7fbec1dd 100644
--- a/core/ui/ControlPanel/Modals/AddPlugins.tid
+++ b/core/ui/ControlPanel/Modals/AddPlugins.tid
@@ -118,10 +118,12 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 \end
 
 \define load-plugin-library-button()
+<$list filter="[<currentTiddler>get[enabled]else[yes]match[yes]]" variable="ignore">
 <$button class="tc-btn-big-green">
 <$action-sendmessage $message="tm-load-plugin-library" url={{!!url}} infoTitlePrefix="$:/temp/RemoteAssetInfo/"/>
 {{$:/core/images/chevron-right}} {{$:/language/ControlPanel/Plugins/OpenPluginLibrary}}
 </$button>
+</$list>
 \end
 
 \define display-server-assets(type)
diff --git a/plugins/tiddlywiki/tiddlyweb/configOfficialPluginLibrary.tid b/plugins/tiddlywiki/tiddlyweb/configOfficialPluginLibrary.tid
index 9f0e164f4..d2a07991a 100644
--- a/plugins/tiddlywiki/tiddlyweb/configOfficialPluginLibrary.tid
+++ b/plugins/tiddlywiki/tiddlyweb/configOfficialPluginLibrary.tid
@@ -1,3 +1,7 @@
 title: $:/config/OfficialPluginLibrary
+tags: $:/tags/PluginLibrary
+url: https://tiddlywiki.com/library/v5.1.23/index.html
+caption: {{$:/language/OfficialPluginLibrary}}
+enabled: no
 
-(This core tiddler is overridden by the tiddlyweb plugin to prevent users from installing official plugins via control panel. Instead they should be installed by editing tiddlywiki.info in the root of the wiki folder)
\ No newline at end of file
+The official plugin library is disabled when using the client-server configuration. Instead, plugins should be installed via the `tiddlywiki.info` file, as described [[here|https://tiddlywiki.com/#Installing%20a%20plugin%20from%20the%20plugin%20library]].
\ No newline at end of file