diff --git a/resources/lang/en/gallery.php b/resources/lang/en/gallery.php
index eb5cf35..c2b6384 100644
--- a/resources/lang/en/gallery.php
+++ b/resources/lang/en/gallery.php
@@ -14,6 +14,7 @@ return [
     'camera_software' => 'Camera software:',
     'child_albums' => 'more album|more albums',
     'date_taken' => 'Date taken:',
+    'date_uploaded' => 'Date uploaded:',
     'file_name' => 'File name:',
     'focal_length' => 'Focal length:',
     'focal_length_units' => ':valuemm',
@@ -69,7 +70,9 @@ return [
         'activity' => 'Activity',
         'activity_summary' => ':count photo on :date|:count photos on :date',
         'activity_taken_p1' => 'Photos taken by :user_name:',
+        'activity_taken_tab' => 'Taken',
         'activity_uploaded_p1' => 'Photos uploaded by :user_name:',
+        'activity_uploaded_tab' => 'Uploaded',
         'albums' => 'Albums by :user_name',
         'cameras' => 'Cameras',
         'no_albums_p1' => 'No Photo Albums',
diff --git a/resources/views/themes/base/gallery/user_profile.blade.php b/resources/views/themes/base/gallery/user_profile.blade.php
index 77aa1c5..6ef4882 100644
--- a/resources/views/themes/base/gallery/user_profile.blade.php
+++ b/resources/views/themes/base/gallery/user_profile.blade.php
@@ -54,7 +54,25 @@
 
                 <h3 class="mt-5 text-muted">@lang('gallery.user_profile.activity')</h3>
                 <p>@lang('gallery.user_profile.activity_taken_p1', ['user_name' => $user->name])</p>
-                @include (Theme::viewName('partials.user_profile_activity_grid'), ['activity' => $activity_taken])
+
+                <div>
+                    {{-- Nav tabs --}}
+                    <ul class="nav nav-tabs" role="tablist">
+                        @include(Theme::viewName('partials.tab'), ['active_tab' => 'activity-taken', 'tab_name' => 'activity-taken', 'tab_icon' => 'camera', 'tab_text' => trans('gallery.user_profile.activity_taken_tab')])
+                        @include(Theme::viewName('partials.tab'), ['active_tab' => 'activity-taken', 'tab_name' => 'activity-uploaded', 'tab_icon' => 'upload', 'tab_text' => trans('gallery.user_profile.activity_uploaded_tab')])
+                    </ul>
+
+                    {{-- Tab panes --}}
+                    <div class="tab-content">
+                        {{-- General --}}
+                        <div role="tabpanel" class="tab-pane active" id="activity-taken-tab">
+                            @include (Theme::viewName('partials.user_profile_activity_grid'), ['activity' => $activity_taken])
+                        </div>
+                        <div role="tabpanel" class="tab-pane" id="activity-uploaded-tab">
+                            @include (Theme::viewName('partials.user_profile_activity_grid'), ['activity' => $activity_uploaded])
+                        </div>
+                    </div>
+                </div>
 
                 @if (count($cameras) > 0)
                     <h3 class="mb-4 mt-5 text-muted">@lang('gallery.user_profile.cameras')</h3>