--- rxvt-unicode/src/perl/urxvt-popup	2006/01/18 11:05:09	1.13
+++ rxvt-unicode/src/perl/urxvt-popup	2007/12/24 08:21:40	1.15
@@ -53,11 +53,6 @@
 sub on_button_release {
    my ($self, $event) = @_;
 
-   if ($event->{button} == $self->{data}{event}{button}) {
-      $self->ungrab;
-      $self->destroy;
-   }
-
    $self->{press}[$event->{button}] = 0;
 
    my ($row, $col) = ($event->{row}, $event->{col});
@@ -69,6 +64,11 @@
 
    $self->refresh;
 
+   if ($event->{button} == $self->{data}{event}{button}) {
+      $self->ungrab;
+      $self->destroy;
+   }
+
    1
 }
 
@@ -108,6 +108,8 @@
 
    $self->resource (geometry => "${width}x${height}$pos");
 
+   $self->{term}{urxvt_popup_init_done} = 1;
+
    ()
 }