diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 23631bb0e..a412602b4 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -5,6 +5,7 @@
  - fixed defaultValues of undef cause mysql5.1 to complain about columns that are set to be NOT NULL.  5.0 doesn't care.
  - International text retrieval has been optimized
  - fixed #9766: Thingy Pagination Broken
+ - fixed #9779: Gallery: js for search (datepicker?) included in album view
 
 7.6.12
  - fixed: During postback on a recurring transaction, the routine could error out instead of catching an error.
diff --git a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
index 42b713e4c..2bd363323 100644
--- a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
+++ b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
@@ -647,7 +647,8 @@ sub prepareView {
         = WebGUI::Asset::Template->new($self->session, $templateId);
     $template->prepare($self->getMetaDataAsTemplateVariables);
 
-    $self->{_viewTemplate} = $template;
+    $self->{_viewTemplate}  = $template;
+    $self->{_viewVariables} = $self->getTemplateVars;
 }
 
 #----------------------------------------------------------------------------
@@ -776,7 +777,7 @@ to be displayed within the page style.
 sub view {
     my $self        = shift;
     my $session     = $self->session;	
-    my $var         = $self->getTemplateVars;
+    my $var         = delete $self->{_viewVariables};
     
     my $p           = $self->getFilePaginator;
     $p->appendTemplateVars( $var );