diff --git a/modules/editor/components/poll_maker/lang/ko.lang.php b/modules/editor/components/poll_maker/lang/ko.lang.php
index e5256f391..ed2fe7fef 100644
--- a/modules/editor/components/poll_maker/lang/ko.lang.php
+++ b/modules/editor/components/poll_maker/lang/ko.lang.php
@@ -13,4 +13,6 @@
     $lang->cmd_add_poll = "설문 추가";
     $lang->cmd_del_poll = "설문 제거";
     $lang->cmd_add_item = "항목 추가";
+
+    $lang->msg_poll_cannot_modify = '설문조사는 수정하실 수 없습니다. 삭제후 다시 생성하셔야 합니다';
 ?>
diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index 647a9cb94..db9397687 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -3,6 +3,10 @@
 <!--%import("filter/insert_poll.xml")-->
 <!--%import("../lang")-->
 
+<script type="text/javascript">
+    var msg_poll_cannot_modify = "{$lang->msg_poll_cannot_modify}";
+</script>
+
 <form action="./" method="post" id="fo_component" onSubmit="procFilter(this, insert_poll); return false;">
     <input type="hidden" name="component" value="{$component_info->component_name}" />
     <input type="hidden" name="method" value="insertPoll" />
diff --git a/modules/editor/components/poll_maker/tpl/popup.js b/modules/editor/components/poll_maker/tpl/popup.js
index d4fa18087..bfd451ff0 100644
--- a/modules/editor/components/poll_maker/tpl/popup.js
+++ b/modules/editor/components/poll_maker/tpl/popup.js
@@ -4,6 +4,11 @@
  **/
 var poll_index = 1;
 function setPoll() {
+    var node = opener.editorPrevNode;
+    if(node && node.getAttribute('editor_component')=='poll_maker') {
+        alert(msg_poll_cannot_modify);
+        window.close();
+    }
     var obj = xCreateElement("div");
     var source = xGetElementById("poll_source");