diff --git a/app/helpers/dates_helper.rb b/app/helpers/dates_helper.rb
index 9cd6625..2b1bbc9 100644
--- a/app/helpers/dates_helper.rb
+++ b/app/helpers/dates_helper.rb
@@ -42,6 +42,14 @@ module DatesHelper
   end
 
   def show_month(year, month)
+
+    if year.blank?
+      year = Date.today.year
+    end
+    if month.blank?
+      month = Date.today.month
+    end
+
     # FIXME Date#strftime should translate this for us !!! 
     monthname = _([
                   N_('January'),
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index ea1b85c..8d624e7 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -814,6 +814,13 @@ class SearchControllerTest < Test::Unit::TestCase
     assert_equal 0, assigns(:calendar).size % 7
   end
 
+  should 'display current year/month by default' do
+    Date.expects(:today).returns(Date.new(2008, 8, 1)).at_least_once
+
+    get :assets, :asset => 'events'
+    assert_tag :tag => 'h1', :content => /^\s*August 2008\s*$/
+  end
+
   should 'submit search form to /search when viewing asset' do
     get :index, :asset => 'people'
     assert_tag :tag => "form", :attributes => { :class => 'search_form', :action => '/search' }
diff --git a/test/unit/dates_helper_test.rb b/test/unit/dates_helper_test.rb
index b83958e..10ebd24 100644
--- a/test/unit/dates_helper_test.rb
+++ b/test/unit/dates_helper_test.rb
@@ -38,6 +38,15 @@ class DatesHelperTest < Test::Unit::TestCase
     assert_equal 'January 2008', show_month(2008, 1)
   end
 
+  should 'fallback to current year/month in show_month' do
+    Date.expects(:today).returns(Date.new(2008,11,1)).at_least_once
+
+    expects(:_).with('November').returns('November').at_least_once
+    expects(:_).with('%{month} %{year}').returns('%{month} %{year}').at_least_once
+    assert_equal 'November 2008', show_month(nil, nil)
+    assert_equal 'November 2008', show_month('', '')
+  end
+
   should 'provide link to previous month' do
     expects(:link_to).with('&larr; January 2008', { :year => 2008, :month => 1})
     link_to_previous_month('2008', '2')
--
libgit2 0.21.2