diff --git a/core/modules/startup/windows.js b/core/modules/startup/windows.js
index 2528a51b0..f27dc8d48 100644
--- a/core/modules/startup/windows.js
+++ b/core/modules/startup/windows.js
@@ -24,7 +24,7 @@ exports.startup = function() {
 		var refreshHandler,
 			title = event.param || event.tiddlerTitle,
 			paramObject = event.paramObject || {},
-			template = paramObject.template || "$:/core/ui/ViewTemplate/body",
+			template = paramObject.template || "$:/core/templates/single.tiddler.window",
 			width = paramObject.width || "700",
 			height = paramObject.height || "600";
 		// Open the window
diff --git a/core/templates/single.tiddler.window.tid b/core/templates/single.tiddler.window.tid
new file mode 100644
index 000000000..a0a8b078e
--- /dev/null
+++ b/core/templates/single.tiddler.window.tid
@@ -0,0 +1,32 @@
+title: $:/core/templates/single.tiddler.window
+
+<$set name="themeTitle" value={{$:/view}}>
+
+<$set name="tempCurrentTiddler" value=<<currentTiddler>>>
+
+<$set name="currentTiddler" value={{$:/language}}>
+
+<$set name="languageTitle" value={{!!name}}>
+
+<$set name="currentTiddler" value=<<tempCurrentTiddler>>>
+
+<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]">
+
+<$navigator story="$:/StoryList" history="$:/HistoryList">
+
+<$transclude mode="block"/>
+
+</$navigator>
+
+</$importvariables>
+
+</$set>
+
+</$set>
+
+</$set>
+
+</$set>
+
+</$set>
+