diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 1403ea56e1..49e40a182e 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -316,6 +316,7 @@ class AccountController extends Controller
         // prep for "specific date" view.
         if (strlen($moment) > 0 && 'all' !== $moment) {
             $start    = new Carbon($moment);
+            $start    = app('navigation')->startOfPeriod($start, $range);
             $end      = app('navigation')->endOfPeriod($start, $range);
             $fStart   = $start->formatLocalized($this->monthAndDayFormat);
             $fEnd     = $end->formatLocalized($this->monthAndDayFormat);
@@ -470,7 +471,7 @@ class AccountController extends Controller
                       ->withOpposingAccount();
             $spent = strval($collector->getJournals()->sum('transaction_amount'));
 
-            $dateStr  = $date['start']->format('Y-m-d');
+            $dateStr  = $date['end']->format('Y-m-d');
             $dateName = app('navigation')->periodShow($date['start'], $date['period']);
             $entries->push(
                 [
@@ -478,7 +479,7 @@ class AccountController extends Controller
                     'name'   => $dateName,
                     'spent'  => $spent,
                     'earned' => $earned,
-                    'date'   => clone $date['start'],]
+                    'date'   => clone $date['end'],]
             );
         }
 
diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index edf3a22fe5..79b34d6243 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -126,7 +126,7 @@
             <div class="col-lg-2 col-md-4 col-sm-12 col-xs-12">
                 {% for period in periods %}
                     {% if (period.spent != 0 or period.earned != 0) %}
-                        <div class="box {% if period.date == start %}box-solid box-primary{% endif %}">
+                        <div class="box {% if period.date == end %}box-solid box-primary{% endif %}">
                             <div class="box-header with-border">
                                 <h3 class="box-title"><a href="{{ route('accounts.show',[account.id,period.string]) }}">{{ period.name }}</a>
                                 </h3>