diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickDirectoryDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickDirectoryDialog.kt
index ea4fcb14d..3a8152d63 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickDirectoryDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickDirectoryDialog.kt
@@ -21,10 +21,9 @@ import kotlinx.android.synthetic.main.dialog_directory_picker.view.*
 class PickDirectoryDialog(val activity: SimpleActivity, val sourcePath: String, val callback: (path: String) -> Unit) {
     var dialog: AlertDialog
     var shownDirectories: ArrayList<Directory> = ArrayList()
-    var view: View
+    var view: View = LayoutInflater.from(activity).inflate(R.layout.dialog_directory_picker, null)
 
     init {
-        view = LayoutInflater.from(activity).inflate(R.layout.dialog_directory_picker, null)
         (view.directories_grid.layoutManager as GridLayoutManager).apply {
             orientation = if (activity.config.scrollHorizontally) GridLayoutManager.HORIZONTAL else GridLayoutManager.VERTICAL
             spanCount = activity.config.dirColumnCnt
diff --git a/app/src/main/res/layout/dialog_directory_picker.xml b/app/src/main/res/layout/dialog_directory_picker.xml
index 57c9fb4e8..0a586affb 100644
--- a/app/src/main/res/layout/dialog_directory_picker.xml
+++ b/app/src/main/res/layout/dialog_directory_picker.xml
@@ -4,13 +4,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/directories_grid_holder"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/activity_margin">
 
     <com.simplemobiletools.commons.views.MyScalableRecyclerView
         android:id="@+id/directories_grid"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/activity_margin"
         android:scrollbars="none"
         app:layoutManager="android.support.v7.widget.GridLayoutManager"
         app:spanCount="@integer/directory_columns_vertical_scroll"/>