diff --git a/core/ui/PageTemplate/sidebar.tid b/core/ui/PageTemplate/sidebar.tid
index a670c1e76..147126621 100644
--- a/core/ui/PageTemplate/sidebar.tid
+++ b/core/ui/PageTemplate/sidebar.tid
@@ -6,7 +6,7 @@ tags: $:/tags/PageTemplate
 <div class="tw-subtitle">{{SiteSubtitle}}</div>
 
 <div class="tw-page-controls">
-<$list filter="[is[shadow]!has[draft.of]tag[$:/tags/PageControls]] [!is[shadow]!has[draft.of]tag[$:/tags/PageControls]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
+<$list filter="[is[shadow]!has[draft.of]tag[$:/tags/PageControls]] [!is[shadow]!has[draft.of]tag[$:/tags/PageControls]] [tag[$:/tags/PageControls]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
 </div>
 
 {{$:/core/ui/SideBarLists}}
diff --git a/editions/tw5.com/tiddlers/Release 5.0.0alpha18.tid b/editions/tw5.com/tiddlers/Release 5.0.0alpha18.tid
new file mode 100644
index 000000000..7b997330e
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Release 5.0.0alpha18.tid	
@@ -0,0 +1,13 @@
+created: 20131201132300007
+creator: JeremyRuston
+modified: 20131201132331749
+modifier: JeremyRuston
+tags: releasenote
+title: Release 5.0.0-alpha.18
+type: text/vnd.tiddlywiki
+
+//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.0.0-alpha.17...v5.0.0-alpha.18]]//
+
+!! Bug fixes
+
+* Fixed bug that was preventing `$:/tags/PageControls` tiddlers from being rearranged