diff --git a/core/modules/macros/fields.js b/core/modules/macros/fields.js
new file mode 100644
index 000000000..9a2514cd2
--- /dev/null
+++ b/core/modules/macros/fields.js
@@ -0,0 +1,67 @@
+/*\
+title: $:/core/modules/macros/fields.js
+type: application/javascript
+module-type: macro
+
+Fields macro
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.info = {
+	name: "fields",
+	dependentOnContextTiddler: true,
+	params: {
+	}
+};
+
+exports.executeMacro = function() {
+	// Create the table
+	var attributes = {
+		"class": ["tw-fields-table"]
+	};
+	if(this.classes) {
+		$tw.utils.pushTop(attributes["class"],this.classes);
+	}
+	var rows = [
+		$tw.Tree.Element("tr",{},[
+			$tw.Tree.Element("th",{},[$tw.Tree.Text("Field")]),
+			$tw.Tree.Element("th",{},[$tw.Tree.Text("Value")])
+		])
+	];
+	// Get the value to display
+	var tiddler = this.wiki.getTiddler(this.tiddlerTitle);
+	if(tiddler) {
+		var fields = [];
+		for(var f in tiddler.fields) {
+			fields.push(f);
+		}
+		fields.sort();
+		for(f=0; f<fields.length; f++) {
+			var value;
+			if(fields[f] === "text") {
+				value = $tw.Tree.Element("em",{},[
+					$tw.Tree.Text("(length: " + tiddler.fields.text.length + ")")
+				]);
+			} else {
+				value = $tw.Tree.Text(tiddler.getFieldString(fields[f]));
+			}
+			rows.push($tw.Tree.Element("tr",{},[
+				$tw.Tree.Element("td",{},[$tw.Tree.Text(fields[f])]),
+				$tw.Tree.Element("td",{},[value])
+			]));
+		}
+	}
+	var child = $tw.Tree.Element("table",attributes,[
+		$tw.Tree.Element("tbody",{},rows)	
+	]);
+	child.execute(this.parents,this.tiddlerTitle);
+	return child;
+	return this.viewer.render();
+};
+
+})();
diff --git a/core/templates/ViewTemplate.tid b/core/templates/ViewTemplate.tid
index 86e40c817..2170dcbf7 100644
--- a/core/templates/ViewTemplate.tid
+++ b/core/templates/ViewTemplate.tid
@@ -1,11 +1,28 @@
 title: $:/templates/ViewTemplate
 modifier: JeremyRuston
 
-<div class="title">
-	<span><<view title>></span> <span> <<reveal state:[[$:/EditMode]] type:match text:yes>< <<button EditTiddler class:"btn-invisible"><[img[$:/core/images/edit-button.svg]]>> >> </span>
+<<button popup:FieldsDropDownLocation qualifyTiddlerTitles:yes class:"btn-invisible"><
+<span class="title"><<view title>> </span>
+>>
+<span> <<reveal state:[[$:/EditMode]] type:match text:yes>< <<button EditTiddler class:"btn-invisible"><[img[$:/core/images/edit-button.svg]]>> >> </span>
 	<<button close class:"btn-invisible pull-right"><[img[$:/core/images/close-button.svg]]>>
+
+<div class:"small"><<view modifier link>> <<view modified relativedate>></div>
+
+<<reveal state:FieldsDropDownLocation type:popup qualifyTiddlerTitles:yes><
+
+<div class="open">
+
+{{dropdown-menu table table-condensed{
+
+<<fields>>
+
+}}}
+
 </div>
-<div class="small"><<view modifier link>> <<view modified relativedate>></div>
+
+>>
+
 {{tw-tags-wrapper{
 ((([is[current]tags[]]))($:/templates/TagTemplate))
 }}}