diff --git a/app/components/table-filters/date-range.coffee b/app/components/table-filters/date-range.coffee
index 9dddfc6..4fede15 100644
--- a/app/components/table-filters/date-range.coffee
+++ b/app/components/table-filters/date-range.coffee
@@ -42,6 +42,9 @@ export default Ember.Component.extend
 
   actions:
     set_filter: (key, value) ->
+      if value
+        edge = if key is 'upper_bound' then 'end' else 'start'
+        value["#{edge}Of"]('day')
       @set key, value
       @$('.dropdown').dropdown('hide') if key is 'upper_bound'
       @get('apply_filters')(@) if @get('eager_filter')
@@ -52,10 +55,10 @@ export default Ember.Component.extend
       @get('apply_filters')(@) if @get('eager_filter')
 
     set_filter_today: ->
-      today = moment()
+      today = moment().startOf('day')
       @setProperties
         lower_bound: today
-        upper_bound: today
+        upper_bound: today.clone().endOf('day')
       @get('apply_filters')(@)
       @$('.dropdown').dropdown('hide')