diff -ruN original/ckeditor.module mod/ckeditor.module
--- original/ckeditor.module	2010-03-05 16:32:47.000000000 +0600
+++ mod/ckeditor.module	2010-04-19 15:47:04.000000000 +0700
@@ -964,7 +964,7 @@
     }
 
     if ($conf['popup'] == 't') {
-      $suffix .= ' <span style="display:none" class="ckeditor_popuplink ckeditor_links">(<a href="#" onclick="ckeditorOpenPopup(\''. $textarea_id .'\', \''. $element['#id'] .'\', \''. $conf['width'] .'\');">'. t('Open rich text editor') ."</a>)</span>";
+      $suffix .= ' <span style="display:none" class="ckeditor_popuplink ckeditor_links">(<a href="#" onclick="return ckeditorOpenPopup(\''. $textarea_id .'\', \''. $element['#id'] .'\', \''. $conf['width'] .'\');">'. t('Open rich text editor') ."</a>)</span>";
     }
   }
 
diff -ruN original/includes/ckeditor.popup.html mod/includes/ckeditor.popup.html
--- original/includes/ckeditor.popup.html	2009-12-05 02:36:57.000000000 +0600
+++ mod/includes/ckeditor.popup.html	2010-04-19 15:41:23.000000000 +0700
@@ -7,6 +7,7 @@
   <title>CKEditor</title>
   <!-- $id$ -->
   <script type="text/javascript">
+  var ckeditor_was_opened_in_popup_window = true;
   var Drupal=window.opener['Drupal'];
 document.write('<scr' + 'ipt src="' + window.opener['Drupal'].settings.basePath + 'misc/jquery.js"></scr' + 'ipt>');
 document.write('<scr' + 'ipt src="' + window.opener['Drupal'].settings.ckeditor.editor_path + '/ckeditor.js?I"></scr' + 'ipt>');
diff -ruN original/includes/ckeditor.utils.js mod/includes/ckeditor.utils.js
--- original/includes/ckeditor.utils.js	2010-03-06 17:04:38.000000000 +0600
+++ mod/includes/ckeditor.utils.js	2010-04-19 15:42:23.000000000 +0700
@@ -41,7 +41,7 @@
   if (teaser = Drupal.ckeditorTeaserInfo(textarea_id)) {
     var ch_checked = teaser.checkbox.attr('checked');
     var tv = teaser.textarea.val();
-    if (tv && tv.length > 0) {
+    if (tv.length > 0) {
       $("#" + textarea_id).val(tv + '\n<!--break-->\n' + $("#" + textarea_id).val());
       teaser.textarea.val('');
     }
@@ -220,7 +220,7 @@
   // find the elements
   if (Drupal.ckeditorTeaser.lookup[taid]) {
     var obj;
-    if (window.opener) {
+    if (window.opener && window.ckeditor_was_opened_in_popup_window) {
       obj = {
         textarea: window.opener.$('#' + Drupal.ckeditorTeaser.lookup[taid]),
         checkbox: window.opener.$('#' + Drupal.settings.teaserCheckbox[Drupal.ckeditorTeaser.lookup[taid]])
