diff --git a/core/modules/storyviews/classic.js b/core/modules/storyviews/classic.js
index a85e458c57a..1486f3b299e 100644
--- a/core/modules/storyviews/classic.js
+++ b/core/modules/storyviews/classic.js
@@ -27,7 +27,7 @@ ClassicStoryView.prototype.navigateTo = function(historyInfo) {
 	var listItemWidget = this.listWidget.children[listElementIndex],
 		targetElement = listItemWidget.findFirstDomNode();
 	// Abandon if the list entry isn't a DOM element (it might be a text node)
-	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
+	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE || listItemWidget.getVariable("tv-disable-storyview-scroll") === "yes") {
 		return;
 	}
 	// Scroll the node into view
diff --git a/core/modules/storyviews/pop.js b/core/modules/storyviews/pop.js
index e2634e3d5b1..0c6ce3cd42a 100644
--- a/core/modules/storyviews/pop.js
+++ b/core/modules/storyviews/pop.js
@@ -24,7 +24,7 @@ PopStoryView.prototype.navigateTo = function(historyInfo) {
 	var listItemWidget = this.listWidget.children[listElementIndex],
 		targetElement = listItemWidget.findFirstDomNode();
 	// Abandon if the list entry isn't a DOM element (it might be a text node)
-	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
+	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE || listItemWidget.getVariable("tv-disable-storyview-scroll") === "yes") {
 		return;
 	}
 	// Scroll the node into view
diff --git a/core/modules/storyviews/zoomin.js b/core/modules/storyviews/zoomin.js
index d02f705e73e..087dfb5bd4c 100644
--- a/core/modules/storyviews/zoomin.js
+++ b/core/modules/storyviews/zoomin.js
@@ -119,7 +119,9 @@ ZoominListView.prototype.navigateTo = function(historyInfo) {
 		},duration);
 	}
 	// Scroll the target into view
-//	$tw.pageScroller.scrollIntoView(targetElement);
+	/* if(listItemWidget.getVariable("tv-disable-storyview-scroll") !== "yes") {
+		$tw.pageScroller.scrollIntoView(targetElement);
+	}*/
 };
 
 /*
diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid
index 0edc335054f..a0329aaf2af 100644
--- a/core/ui/EditTemplate/fields.tid
+++ b/core/ui/EditTemplate/fields.tid
@@ -77,6 +77,7 @@ $value={{{ [subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
 <div class="tc-edit-fields">
 <table class={{{ [all[current]fields[]] :filter[lookup[$:/config/EditTemplateFields/Visibility/]!match[hide]] +[count[]!match[0]] +[then[tc-edit-fields]] ~[[tc-edit-fields tc-edit-fields-small]] }}}>
 <tbody>
+<$set name="tv-disable-storyview-scroll" value="yes">
 <$list filter="[all[current]fields[]] +[sort[title]]" variable="currentField" storyview="pop">
 <$list filter=<<config-filter>> variable="temp">
 <tr class="tc-edit-field">
@@ -96,6 +97,7 @@ $value={{{ [subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
 </tr>
 </$list>
 </$list>
+</$set>
 </tbody>
 </table>
 </div>
diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index c8d4131feb4..6997f8638a3 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -47,14 +47,16 @@ tags: $:/tags/EditTemplate
 
 \procedure edit-tags-template(tagField:"tags")
 <div class="tc-edit-tags">
-	<$list filter="[<currentTiddler>get<tagField>enlist-input[]sort[title]]" storyview="pop">
-		<$macrocall $name="tag-body"
-			colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
-			palette={{$:/palette}}
-			icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}}
-			tagField=<<tagField>>
-		/>
-	</$list>
+	<$set name="tv-disable-storyview-scroll" value="yes">
+		<$list filter="[<currentTiddler>get<tagField>enlist-input[]sort[title]]" storyview="pop">
+			<$macrocall $name="tag-body"
+				colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
+				palette={{$:/palette}}
+				icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}}
+				tagField=<<tagField>>
+			/>
+		</$list>
+	</$set>
 	<$let tabIndex={{$:/config/EditTabIndex}} cancelPopups="yes">
 		<$macrocall $name="tag-picker" tagField=<<tagField>>/>
 	</$let>
diff --git a/core/ui/Manager/ItemSidebarTags.tid b/core/ui/Manager/ItemSidebarTags.tid
index 1c2cbf85cf8..65c88681726 100644
--- a/core/ui/Manager/ItemSidebarTags.tid
+++ b/core/ui/Manager/ItemSidebarTags.tid
@@ -15,6 +15,7 @@ caption: {{$:/language/Manager/Item/Tags}}
 \end
 
 <p>
+<$set name="tv-disable-storyview-scroll" value="yes">
 <$list filter="[all[current]tags[]] [list[$:/config/Manager/RecentTags]] +[sort[title]] " variable="tag" storyview="pop">
 <div>
 <$checkbox tiddler=<<currentTiddler>> tag=<<tag>> actions=<<tag-checkbox-actions>>>
@@ -22,6 +23,7 @@ caption: {{$:/language/Manager/Item/Tags}}
 </$checkbox>
 </div>
 </$list>
+</$set>
 </p>
 <p>
 <$fieldmangler>
diff --git a/core/ui/PageControls.tid b/core/ui/PageControls.tid
index 833b4cbcb73..972ae88b8cd 100644
--- a/core/ui/PageControls.tid
+++ b/core/ui/PageControls.tid
@@ -5,10 +5,12 @@ title: $:/core/ui/PageTemplate/pagecontrols
 
 <div class="tc-page-controls">
 	<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
-		<$list filter="[<config-title>!text[hide]]" storyview="pop" variable="ignore">
-			<$let tv-config-toolbar-class={{{ [enlist<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]] +[join[ ]] }}}>
-				<$transclude $tiddler=<<listItem>> $mode="inline"/>
-			</$let>
-		</$list>
+		<$set name="tv-disable-storyview-scroll" value="yes">
+			<$list filter="[<config-title>!text[hide]]" storyview="pop" variable="ignore">
+				<$let tv-config-toolbar-class={{{ [enlist<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]] +[join[ ]] }}}>
+					<$transclude $tiddler=<<listItem>> $mode="inline"/>
+				</$let>
+			</$list>
+		</$set>
 	</$list>
 </div>
\ No newline at end of file
diff --git a/core/ui/PageTemplate/alerts.tid b/core/ui/PageTemplate/alerts.tid
index ce1b93db9af..515c27397b0 100644
--- a/core/ui/PageTemplate/alerts.tid
+++ b/core/ui/PageTemplate/alerts.tid
@@ -3,6 +3,10 @@ tags: $:/tags/PageTemplate
 
 <div class="tc-alerts">
 
+<$set name="tv-disable-storyview-scroll" value="yes">
+
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Alert]!has[draft.of]]" template="$:/core/ui/AlertTemplate" storyview="pop"/>
 
+</$set>
+
 </div>
diff --git a/core/ui/PageTemplate/topleftbar.tid b/core/ui/PageTemplate/topleftbar.tid
index 2362db869a6..fe5902378ef 100644
--- a/core/ui/PageTemplate/topleftbar.tid
+++ b/core/ui/PageTemplate/topleftbar.tid
@@ -3,10 +3,14 @@ tags: $:/tags/PageTemplate
 
 <span class="tc-topbar tc-topbar-left">
 
+<$set name="tv-disable-storyview-scroll" value="yes">
+
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/TopLeftBar]!has[draft.of]]" variable="listItem" storyview="pop">
 
 <$transclude tiddler=<<listItem>> mode="inline"/>
 
 </$list>
 
+</$set>
+
 </span>
diff --git a/core/ui/PageTemplate/toprightbar.tid b/core/ui/PageTemplate/toprightbar.tid
index 03629fff259..20251bfd473 100644
--- a/core/ui/PageTemplate/toprightbar.tid
+++ b/core/ui/PageTemplate/toprightbar.tid
@@ -3,10 +3,14 @@ tags: $:/tags/PageTemplate
 
 <span class="tc-topbar tc-topbar-right">
 
+<$set name="tv-disable-storyview-scroll" value="yes">
+
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/TopRightBar]!has[draft.of]]" variable="listItem" storyview="pop">
 
 <$transclude tiddler=<<listItem>> mode="inline"/>
 
 </$list>
 
+</$set>
+
 </span>
diff --git a/core/ui/SideBar/Open.tid b/core/ui/SideBar/Open.tid
index d3e52814801..8ac0188ca99 100644
--- a/core/ui/SideBar/Open.tid
+++ b/core/ui/SideBar/Open.tid
@@ -24,11 +24,13 @@ $button$
 \end
 
 <div class="tc-sidebar-tab-open">
+<$set name="tv-disable-storyview-scroll" value="yes">
 <$list filter="[list<tv-story-list>]" history=<<tv-history-list>> storyview="pop">
 <div class="tc-sidebar-tab-open-item">
 <$macrocall $name="droppable-item" button="<$button message='tm-close-tiddler' tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class='tc-btn-invisible tc-btn-mini tc-small-gap-right'>{{$:/core/images/close-button}}</$button><$link/>"/>
 </div>
 </$list>
+</$set>
 <$tiddler tiddler="">
 <div>
 <$macrocall $name="droppable-item" button="<$button message='tm-close-all-tiddlers' class='tc-btn-invisible tc-btn-mini'><<lingo Button>></$button>"/>
diff --git a/core/ui/ViewTemplate/tags/default.tid b/core/ui/ViewTemplate/tags/default.tid
index d524bfccdd4..2fabf6c94e7 100644
--- a/core/ui/ViewTemplate/tags/default.tid
+++ b/core/ui/ViewTemplate/tags/default.tid
@@ -2,10 +2,12 @@ title: $:/core/ui/ViewTemplate/tags/default
 
 \whitespace trim
 <$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
-  <div class="tc-tags-wrapper">
-    <$list filter="[all[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop"/>
-    <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Tags]!has[draft.of]]">
-      <$transclude mode="inline"/>
-    </$list>
-  </div>
+	<div class="tc-tags-wrapper">
+		<$set name="tv-disable-storyview-scroll" value="yes">
+			<$list filter="[all[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop"/>
+		</$set>
+		<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Tags]!has[draft.of]]">
+			<$transclude mode="inline"/>
+		</$list>
+	</div>
 </$reveal>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
index b2cf1bd8e9c..eaca2f46135 100644
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -7,14 +7,16 @@ tags: $:/tags/ViewTemplate
 <div class="tc-tiddler-title tc-clearfix">
 	<div class="tc-titlebar">
 		<span class="tc-tiddler-controls">
-			<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] :filter[lookup[$:/config/ViewToolbarButtons/Visibility/]!match[hide]]"
-				storyview="pop"
-				variable="listItem"
-			>
-				<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
-					<$transclude tiddler=<<listItem>>/>
-				</$set>
-			</$list>
+			<$set name="tv-disable-storyview-scroll" value="yes">
+				<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] :filter[lookup[$:/config/ViewToolbarButtons/Visibility/]!match[hide]]"
+					storyview="pop"
+					variable="listItem"
+				>
+					<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
+						<$transclude tiddler=<<listItem>>/>
+					</$set>
+				</$list>
+			</$set>
 		</span>
 		<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
 			<$link>
diff --git a/core/wiki/macros/tabs.tid b/core/wiki/macros/tabs.tid
index 1805bc9bea2..8b1fd2e7a49 100644
--- a/core/wiki/macros/tabs.tid
+++ b/core/wiki/macros/tabs.tid
@@ -37,9 +37,11 @@ code-body: yes
 
 \define tabs-tab-list()
 \whitespace trim
-<$list filter=<<__tabsList__>> variable="currentTab" storyview="pop">
-	<<tabs-tab>>
-</$list>
+<$set name="tv-disable-storyview-scroll" value="yes">
+	<$list filter=<<__tabsList__>> variable="currentTab" storyview="pop">
+		<<tabs-tab>>
+	</$list>
+</$set>
 \end
 
 \define tabs-tab-body()