diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt
index 9fe849ce..ecb847b9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt
@@ -134,12 +134,9 @@ class ConverterView @JvmOverloads constructor(
     }
 
     private fun switch() {
-        binding.topUnitText.text.also {
-            binding.topUnitText.text = binding.bottomUnitText.text
-            binding.bottomUnitText.text = it
-        }
-
         ::topUnit.swapWith(::bottomUnit)
+        updateBottomValue()
+        updateUnitLabels()
     }
 
     private fun updateUnitLabels() {