diff --git a/config/app.php b/config/app.php
index 389984e..a24028e 100644
--- a/config/app.php
+++ b/config/app.php
@@ -2,7 +2,7 @@
 
 return [
     // Version number of Blue Twilight
-    'version' => '2.1.0',
+    'version' => '2.1.1-alpha.1',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/resources/views/themes/base/admin/delete_album.blade.php b/resources/views/themes/base/admin/delete_album.blade.php
index 5db360d..2ace94f 100644
--- a/resources/views/themes/base/admin/delete_album.blade.php
+++ b/resources/views/themes/base/admin/delete_album.blade.php
@@ -5,7 +5,7 @@
     <li class="breadcrumb-item"><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
     <li class="breadcrumb-item"><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
     <li class="breadcrumb-item"><a href="{{ route('albums.index') }}">@lang('navigation.breadcrumb.albums')</a></li>
-    <li class="breadcrumb-item"><a href="{{ route('albums.show', ['id' => $album->id]) }}">{{ $album->name }}</a></li>
+    @include(Theme::viewName('partials.admin_album_breadcrumb'), ['show_current_link' => true])
     <li  class="breadcrumb-item active">@lang('navigation.breadcrumb.delete_album')</li>
 @endsection
 
diff --git a/resources/views/themes/base/admin/edit_album.blade.php b/resources/views/themes/base/admin/edit_album.blade.php
index 59552d1..0262909 100644
--- a/resources/views/themes/base/admin/edit_album.blade.php
+++ b/resources/views/themes/base/admin/edit_album.blade.php
@@ -5,7 +5,7 @@
     <li class="breadcrumb-item"><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
     <li class="breadcrumb-item"><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
     <li class="breadcrumb-item"><a href="{{ route('albums.index') }}">@lang('navigation.breadcrumb.albums')</a></li>
-    <li class="breadcrumb-item"><a href="{{ route('albums.show', ['id' => $album->id]) }}">{{ $album->name }}</a></li>
+    @include(Theme::viewName('partials.admin_album_breadcrumb'), ['show_current_link' => true])
     <li class="breadcrumb-item active">@lang('navigation.breadcrumb.edit_album')</li>
 @endsection
 
diff --git a/resources/views/themes/base/admin/show_album.blade.php b/resources/views/themes/base/admin/show_album.blade.php
index eba1456..909f0cb 100644
--- a/resources/views/themes/base/admin/show_album.blade.php
+++ b/resources/views/themes/base/admin/show_album.blade.php
@@ -5,7 +5,13 @@
     <li class="breadcrumb-item"><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
     <li class="breadcrumb-item"><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
     <li class="breadcrumb-item"><a href="{{ route('albums.index') }}">@lang('navigation.breadcrumb.albums')</a></li>
-    <li class="breadcrumb-item active">{{ $album->name }}</li>
+    @foreach ($album->albumParentTree() as $parentAlbum)
+        @if ($parentAlbum->id == $album->id)
+            <li class="breadcrumb-item active">{{ $album->name }}</li>
+        @else
+            <li class="breadcrumb-item"><a href="{{ route('albums.show', ['id' => $parentAlbum->id]) }}">{{ $parentAlbum->name }}</a></li>
+        @endif
+    @endforeach
 @endsection
 
 @section('content')
diff --git a/resources/views/themes/base/partials/admin_album_breadcrumb.blade.php b/resources/views/themes/base/partials/admin_album_breadcrumb.blade.php
new file mode 100644
index 0000000..6cefd36
--- /dev/null
+++ b/resources/views/themes/base/partials/admin_album_breadcrumb.blade.php
@@ -0,0 +1,11 @@
+@foreach ($album->albumParentTree() as $parentAlbum)
+    @if ($parentAlbum->id == $album->id)
+        @if (!empty($show_current_link) && $show_current_link)
+            <li class="breadcrumb-item active"><a href="{{ route('albums.show', ['id' => $album->id]) }}">{{ $album->name }}</a></li>
+        @else
+            <li class="breadcrumb-item active">{{ $album->name }}</li>
+        @endif
+    @else
+        <li class="breadcrumb-item"><a href="{{ route('albums.show', ['id' => $parentAlbum->id]) }}">{{ $parentAlbum->name }}</a></li>
+    @endif
+@endforeach
\ No newline at end of file