diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index e604b93..3fe3888 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -242,4 +242,15 @@ export default class App extends Vue
         // Refresh
         window.location.reload();
     }
+
+    /**
+     * Select time (Eg. Term 1, Term 2, All Year, etc.)
+     *
+     * @param code
+     */
+    public selectTime(code: number)
+    {
+        // TODO: Optimize
+        window.location.reload();
+    }
 }
diff --git a/src/components/app/app.vue b/src/components/app/app.vue
index 4930ffe..016959a 100644
--- a/src/components/app/app.vue
+++ b/src/components/app/app.vue
@@ -3,7 +3,7 @@
         <login v-if="showLogin" v-on:login:token="onLogin"></login>
         <navigation :courses="filteredCourses"
                     :activeIndex.sync="selectedTab"
-                    v-on:sign-out="signOut">
+                    @sign-out="signOut" @select-time="selectTime">
         </navigation>
 
         <div id="app-content" v-if="assignmentsReady && loading === ''">
diff --git a/src/components/navigation/navigation.ts b/src/components/navigation/navigation.ts
index 3bc961e..d1189dd 100644
--- a/src/components/navigation/navigation.ts
+++ b/src/components/navigation/navigation.ts
@@ -32,7 +32,7 @@ export default class Navigation extends Vue
         {
             this.$cookies.set('va.selected-time', this.selectedTime, '10y');
         }
-        this.selectTime(this.$cookies.get('va.selected-time'));
+        this.selectedTime = this.$cookies.get('va.selected-time');
     }
 
     /**