diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt
index ce4d75ec1..950c4c2e4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt
@@ -2,18 +2,70 @@ package com.simplemobiletools.gallery.dialogs
 
 import android.app.AlertDialog
 import android.graphics.Point
-import android.util.Size
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.WindowManager
+import android.widget.EditText
+import com.simplemobiletools.filepicker.extensions.value
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.activities.SimpleActivity
 import kotlinx.android.synthetic.main.resize_image.view.*
 
-class ResizeDialog(val activity: SimpleActivity, val size: Point, val callback: (size: Size) -> Unit) {
+class ResizeDialog(val activity: SimpleActivity, val size: Point, val callback: (newSize: Point) -> Unit) {
     init {
         val view = LayoutInflater.from(activity).inflate(R.layout.resize_image, null)
-        view.image_width.setText(size.x.toString())
-        view.image_height.setText(size.y.toString())
+        val widthView = view.image_width
+        val heightView = view.image_height
+
+        widthView.setText(size.x.toString())
+        heightView.setText(size.y.toString())
+
+        val ratio = size.x / size.y.toFloat()
+
+        widthView.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                if (widthView.hasFocus()) {
+                    var width = getViewValue(widthView)
+                    if (width > size.x) {
+                        widthView.setText(size.x.toString())
+                        width = size.x
+                    }
+
+                    if (view.keep_aspect_ratio.isChecked) {
+                        heightView.setText((width / ratio).toInt().toString())
+                    }
+                }
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            }
+        })
+
+        heightView.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                if (heightView.hasFocus()) {
+                    var height = getViewValue(heightView)
+                    if (height > size.y) {
+                        heightView.setText(size.y.toString())
+                        height = size.y
+                    }
+
+                    if (view.keep_aspect_ratio.isChecked) {
+                        widthView.setText((height * ratio).toInt().toString())
+                    }
+                }
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            }
+        })
 
         AlertDialog.Builder(activity)
                 .setTitle(activity.resources.getString(R.string.resize_and_save))
@@ -25,8 +77,14 @@ class ResizeDialog(val activity: SimpleActivity, val size: Point, val callback:
             setCanceledOnTouchOutside(true)
             show()
             getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener({
-
+                val newSize = Point(getViewValue(widthView), getViewValue(heightView))
+                callback.invoke(newSize)
             })
         }
     }
+
+    fun getViewValue(view: EditText): Int {
+        val textValue = view.value
+        return if (textValue.isEmpty()) 0 else textValue.toInt()
+    }
 }