diff --git a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java b/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java
index bbfff066..fbce4d53 100644
--- a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java
+++ b/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java
@@ -82,9 +82,7 @@ public class MainActivity extends AppCompatActivity {
             return;
 
         if (lastKey == DIGIT) {
-            secondValue = getDisplayedNumberAsDouble();
-            calculateResult();
-            baseValue = getDisplayedNumberAsDouble();
+            getResult();
         }
         resetValue = true;
         lastKey = operation;
@@ -116,6 +114,13 @@ public class MainActivity extends AppCompatActivity {
         handleOperation(MODULO);
     }
 
+    @OnClick(R.id.btn_root)
+    public void rootClicked() {
+        getResult();
+        lastOperation = EQUALS;
+        updateResult(Math.sqrt(baseValue));
+    }
+
     @OnClick(R.id.btn_equals)
     public void equalsClicked() {
         if (lastKey == EQUALS)
@@ -153,6 +158,12 @@ public class MainActivity extends AppCompatActivity {
         baseValue = value;
     }
 
+    private void getResult() {
+        secondValue = getDisplayedNumberAsDouble();
+        calculateResult();
+        baseValue = getDisplayedNumberAsDouble();
+    }
+
     private void calculateResult() {
         switch (lastOperation) {
             case PLUS: