diff --git a/app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php b/app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php
index 0273ac48..39773cd4 100644
--- a/app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php
+++ b/app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php
@@ -35,7 +35,7 @@ class UploadedFilesOverview extends Controller
         // include hidden directories?
         $subdirectories = $this->directoryRepository->getAllSubdirectories($directory);
 
-        if (!Input::get('hidden', true)) {
+        if (!Input::get('hidden', false)) {
             $subdirectories = $subdirectories->where('hidden', false);
         }
 
diff --git a/resources/views/admin/content/_partials/subpages.blade.php b/resources/views/admin/content/_partials/subpages.blade.php
new file mode 100644
index 00000000..412bf99e
--- /dev/null
+++ b/resources/views/admin/content/_partials/subpages.blade.php
@@ -0,0 +1,8 @@
+<option value="{{$optionPage->id}}"
+        @if(old('parentId', $page->parentId) == $optionPage->id) selected @endif>
+    {{$prefix}} {{$optionPage->title}}
+</option>
+
+@foreach($optionPage->subpages as $subpage)
+    @include('admin.content._partials.subpages', ['optionPage' => $subpage, 'prefix' => $prefix.' - '])
+@endforeach
\ No newline at end of file
diff --git a/resources/views/admin/content/formParts/basicInformation.blade.php b/resources/views/admin/content/formParts/basicInformation.blade.php
index 9ab241ca..eb7d8655 100644
--- a/resources/views/admin/content/formParts/basicInformation.blade.php
+++ b/resources/views/admin/content/formParts/basicInformation.blade.php
@@ -43,10 +43,7 @@
             <option value="">@lang('admin/contents.noParentPage')</option>
 
             @foreach($rootPages as $rootPage)
-                <option value="{{$rootPage->id}}"
-                        @if(old('parentId', $page->parentId) == $rootPage->id) selected @endif>
-                    {{$rootPage->title}}
-                </option>
+                @include('admin.content._partials.subpages', ['optionPage' => $rootPage, 'prefix' => ''])
             @endforeach
         </select>