diff --git a/notifications/templates/notifications/_view.html b/notifications/templates/notifications/_view.html
index 8533d89..1ae9501 100644
--- a/notifications/templates/notifications/_view.html
+++ b/notifications/templates/notifications/_view.html
@@ -52,7 +52,7 @@
 
 					{% if notification.level < 3 %}
 						<button class="btn btn-default no_button">{% trans 'or' %}</button>
-						<button class="btn btn-default btn-raised" data-toggle="popover" data-trigger="focus" data-placement="right">
+						<button class="btn btn-default btn-raised" data-toggle="popover" data-placement="right">
 							{% if notification.level == 1 %}
 								{% trans 'Define goal to realization' %}
 							{% else %}
@@ -78,7 +78,7 @@
 								</form>
               				</div>
               				<div class="popover-footer">
-              					<button type="button" class="btn btn-raised btn-sm btn-primary save pull-left">
+              					<button type="button" class="btn btn-raised btn-sm btn-success save pull-left">
               						{% trans 'Save Goal' %}
           						</button>
               					<button type="button" class="btn btn-default btn-sm btn-raised cancel pull-right">
@@ -92,43 +92,3 @@
 		</div>
 	</div>
 </div>
-<script>
-$(document).ready(function(){
-	var locale = navigator.language || navigator.userLanguage;
-
-    $('[data-toggle="popover"]').popover({
-    	html: true,
-        content: function () {
-            return $(".popover").html();
-        }
-	}).on('shown.bs.popover', function (e) {
-		if($(this).is(e.target)){
-			var popover = $(this),
-				datetime = popover.parent().find('.datetimepicker'),
-				form = popover.parent().find('form'),
-				cancel = popover.parent().find('.cancel'),
-				save = popover.parent().find('.save');
-
-			if (typeof(datetime.data("DateTimePicker")) != "undefined") {
-				datetime.data("DateTimePicker").destroy();
-			}
-		    
-		    datetime.datetimepicker({
-		    	locale: locale,
-		        inline: true,
-		        sideBySide: false
-		    });
-
-		    cancel.on("click", function () {
-		    	popover.popover('hide');
-		    });	
-
-		    save.on("click", function () {
-		    	var field = form.find('.meta');
-		    	field.val(datetime.data('date'));
-		    	console.log(form.serialize());
-		    });
-		}
-	}); 
-});
-</script>
\ No newline at end of file
diff --git a/notifications/templates/notifications/subject.html b/notifications/templates/notifications/subject.html
index 8e2e8ba..30fa505 100644
--- a/notifications/templates/notifications/subject.html
+++ b/notifications/templates/notifications/subject.html
@@ -51,4 +51,60 @@
 			{% endif %}
         </div>
     </div>
+	
+	<script type="text/javascript">
+		$(function () {
+			var locale = navigator.language || navigator.userLanguage;
+
+		    $('[data-toggle="popover"]').popover({
+		    	html: true,
+		        content: function () {
+		            return $(".popover").html();
+		        }
+			}).on('show.bs.popover', function (e) {
+				$('[data-toggle="popover"]').not(e.target).popover('hide');
+			}).on('shown.bs.popover', function (e) {
+				if($(this).is(e.target)){
+					var popover = $(this),
+						datetime = popover.parent().find('.datetimepicker'),
+						form = popover.parent().find('form:visible'),
+						cancel = popover.parent().find('.cancel:visible'),
+						save = popover.parent().find('.save:visible');
+
+					if (typeof(datetime.data("DateTimePicker")) != "undefined") {
+						datetime.data("DateTimePicker").destroy();
+					}
+				    
+				    datetime.datetimepicker({
+				    	locale: locale,
+				        inline: true,
+				        sideBySide: false
+				    });
+
+				    cancel.on("click", function () {
+				    	popover.popover('hide');
+				    });	
+
+				    save.on("click", function () {
+				    	var field = form.find('.meta');
+				    	field.val(datetime.data('date'));
+				    	console.log(form.serialize());
+				    });
+				}
+			}).on('hide.bs.popover', function (e) {
+				if($(this).is(e.target)){
+					var popover = $(this),
+						datetime = popover.parent().find('.datetimepicker');
+
+					if (typeof(datetime.data("DateTimePicker")) != "undefined") {
+						datetime.data("DateTimePicker").destroy();
+					}
+
+					datetime.html('');
+				}
+			}).on('hidden.bs.popover', function (e) {
+			    $(e.target).data("bs.popover").inState.click = false;
+			}); 
+		});
+	</script>
 {% endblock %}
\ No newline at end of file
--
libgit2 0.21.2