diff --git a/app/views/shared/_add_new_item_form.rhtml b/app/views/shared/_add_new_item_form.rhtml
index c84e0580..0055f847 100644
--- a/app/views/shared/_add_new_item_form.rhtml
+++ b/app/views/shared/_add_new_item_form.rhtml
@@ -24,7 +24,21 @@
     :html=> { :id=>'todo-form-new-action', :name=>'todo', :class => 'inline-form' },
     :before => "$('todo_new_action_submit').startWaiting()",
     :complete => "$('todo_new_action_submit').stopWaiting()",
-    :condition => "!$('todo_new_action_submit').isWaiting()") do -%>
+    :condition => "!$('todo_new_action_submit').isWaiting() && askIfNewContextProvided()") do -%>
+
+<script type="text/javascript" charset="utf-8">
+	function askIfNewContextProvided() {
+		var contexts = new Array(<%= @contexts.map{|c| '\'' + c.name + '\''}.join(", ") %>);
+		var givenContextName = $('todo_context_name').value;
+		if (givenContextName.length == 0) return true; // show rails validation error
+		for (var i = 0; i < contexts.length; ++i) {
+			if (contexts[i] == givenContextName) {
+				return true;
+			}
+		}
+		return confirm('New context "' + givenContextName + '" will be also created. Are you sure?');
+	}
+</script>
 
 <div id="status"><%= error_messages_for("item", :object_name => 'action') %></div>