diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt
index 4bb9518896..a438af8639 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt
@@ -47,6 +47,7 @@
     <li>
         <input type="hidden" name="shelfid" value="[% shelfid | html %]" />
     </li></ol></fieldset>
+    <input type="hidden" name="op" value="cud-send" />
 
     <nav class="navbar navbar-default navbar-fixed-bottom">
         <div class="container-fluid">
diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl
index e50f3c3cd3..62e7a6fbd5 100755
--- a/virtualshelves/sendshelf.pl
+++ b/virtualshelves/sendshelf.pl
@@ -39,6 +39,7 @@ use Koha::Email;
 use Koha::Virtualshelves;
 
 my $query = CGI->new;
+my $op    = $query->param('op') // q{};
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
@@ -57,7 +58,7 @@ my $shelf = Koha::Virtualshelves->find($shelfid);
 output_and_exit( $query, $cookie, $template, 'insufficient_permission' )
   if $shelf && !$shelf->can_be_viewed($borrowernumber);
 
-if ($to_address) {
+if ( $to_address && $op eq 'cud-send' ) {
     my $comment = $query->param('comment');
 
     my $patron     = Koha::Patrons->find($borrowernumber);