diff --git a/client/system/tags/ui-modal.tag.html b/client/system/tags/ui-modal.tag.html
index a017033..5242669 100644
--- a/client/system/tags/ui-modal.tag.html
+++ b/client/system/tags/ui-modal.tag.html
@@ -31,9 +31,15 @@
 	<script>
 		this.mixin(IO.default);
 		this.on('update',() => {
-			if(this.opts.template) {
+			if(this.opts.template && this.opts.templateOpts) {
 				riot.mount('#modalMount',this.opts.template,this.opts.templateOpts || {});	
 			}
 		});
+		this.on('before-mount', (e) => {
+			let navState = IO.default.getStateByKey('NAV')
+			if (navState.ui_modal.isOpen) {
+				IO.default.obs.trigger('CLOSE_MODAL')
+			}
+		})
 	</script>
 </ui-modal>
diff --git a/package.json b/package.json
index ee74635..da08805 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
     "start": "node ./server.js",
     "devstart": "NODE_ENV=development nodemon ./server.js",
     "wds": "node_modules/.bin/webpack-dev-server",
-    "monitor": "nodemon ./server.js"
+    "monitor": "nodemon ./server.js",
+    "build": "webpack -w"
   },
   "repository": {
     "type": "git",