diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 0a15143fb..b081f4d18 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -2,11 +2,24 @@
 
 <script type="text/javascript">
 //编辑问卷描述之后
+var popWindow ; //弹出框的引用
 function edit_head(){
     $("#polls_description").val($("#polls_description_div").html());
 }
+$(function(){
+    $(document).bind('click',function(e){
+        if(popWindow && e.target.nodeName != 'A' && !popWindow.is(e.target) && popWindow.has(e.target).length === 0){ // Mark 1
+            popWindow.css('display', 'none');
+        }
+        //$("#div_"+quest_type+"_"+quest_id).css('display', 'none');
+    });
+})
 
 function chooseQuestionType(quest_type,quest_id){
+    popWindow = $("#div_"+quest_type+"_"+quest_id);
+    $("#div_"+quest_type+"_"+quest_id).click(function(e){
+        e.stopPropagation();
+    });
     $("#div_"+quest_type+"_"+quest_id).css("position", "absolute");
 
     $("#div_"+quest_type+"_"+quest_id).css("top", $("#add_"+quest_type+"_"+quest_id).offset().top+30);