diff --git a/app/build.gradle b/app/build.gradle
index ccc09ef5f..77f778714 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,6 +12,8 @@ android {
         targetSdkVersion 27
         versionCode 143
         versionName "2.18.0"
+        multiDexEnabled true
+        setProperty("archivesBaseName", "gallery")
     }
 
     signingConfigs {
@@ -49,6 +51,7 @@ dependencies {
     compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.7.2'
     compile 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
     compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
+    compile 'com.android.support:multidex:1.0.2'
     compile 'com.google.code.gson:gson:2.8.2'
     compile 'it.sephiroth.android.exif:library:1.0.1'
     compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.8'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/App.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/App.kt
index 37815fa88..361504972 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/App.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/App.kt
@@ -1,13 +1,13 @@
 package com.simplemobiletools.gallery
 
-import android.app.Application
+import android.support.multidex.MultiDexApplication
 import com.github.ajalt.reprint.core.Reprint
 import com.simplemobiletools.gallery.BuildConfig.USE_LEAK_CANARY
 import com.simplemobiletools.gallery.extensions.config
 import com.squareup.leakcanary.LeakCanary
 import java.util.*
 
-class App : Application() {
+class App : MultiDexApplication() {
     override fun onCreate() {
         super.onCreate()
         if (USE_LEAK_CANARY) {