diff --git a/rpg-docs/client/globalHelpers/GlobalUI.js b/rpg-docs/client/globalHelpers/GlobalUI.js
index 64336d17..387a2cf5 100644
--- a/rpg-docs/client/globalHelpers/GlobalUI.js
+++ b/rpg-docs/client/globalHelpers/GlobalUI.js
@@ -31,6 +31,10 @@ this.GlobalUI = (function() {
 		})(this));
 	};
 
+	GlobalUI.closeDialog = function() {
+		return this.dialog.close();
+	};
+
 	//To show a detail, first animate the click, with raising z-depth
 	//then call this function with a template and data
 	//the element should have a hero-id of detail-main
@@ -52,14 +56,33 @@ this.GlobalUI = (function() {
 		Session.set("global.ui.detailData", opts.data);
 		Session.set("global.ui.detailTemplate", opts.template);
 		Session.set("global.ui.detailHeroId", opts.heroId);
+		if(!!(window.history && window.history.pushState)){
+			history.replaceState({detail: "closed", opts: opts}, "Detail Dialog");
+			history.pushState({detail: "opened", opts: opts}, "Detail Dialog");
+		}
 	};
 
 	GlobalUI.closeDetail = function(){
-		Session.set("global.ui.detailShow", false);
+		if(!!(window.history && window.history.pushState)){
+			history.back();
+		} else{
+			Session.set("global.ui.detailShow", false);
+		}
 	};
 
-	GlobalUI.closeDialog = function() {
-		return this.dialog.close();
+	GlobalUI.popStateHandler = function(e){
+		console.log();
+		var state = e.originalEvent.state;
+		if(state) {
+			if(state.detail === "closed"){
+				Session.set("global.ui.detailShow", false);
+			} else if(state.detail === "opened"){
+				var opts = state.opts;
+				Session.set("global.ui.detailData", opts.data);
+				Session.set("global.ui.detailTemplate", opts.template);
+				Session.set("global.ui.detailHeroId", opts.heroId);
+			}
+		}
 	};
 
 	return GlobalUI;
diff --git a/rpg-docs/client/views/layout/layout.js b/rpg-docs/client/views/layout/layout.js
index 9c475472..cce18268 100644
--- a/rpg-docs/client/views/layout/layout.js
+++ b/rpg-docs/client/views/layout/layout.js
@@ -1,3 +1,11 @@
+Template.layout.rendered = function() {
+	$(window).on('popstate', GlobalUI.popStateHandler);
+};
+
+Template.layout.destroyed = function() {
+	$(window).off('popstate', GlobalUI.popStateHandler);
+};
+
 Template.layout.helpers({
 	notSelected: function(){
 		return Session.get("global.ui.detailShow")? "not-selected" : null;