diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterViewModel.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterViewModel.kt
index 558ba098..64a50180 100644
--- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterViewModel.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterViewModel.kt
@@ -183,7 +183,7 @@ internal class ConverterViewModel @Inject constructor(
             unitTo = unitTo,
             sorting = prefs.unitConverterSorting,
             favorites = prefs.unitConverterFavoritesOnly,
-            input = calculation?.toPlainString() ?: input.text,
+            input = (calculation?.toPlainString() ?: input.text).replace(Token.Operator.minus, "-"),
             scale = prefs.precision,
             outputFormat = prefs.outputFormat,
             formatterSymbols = AllFormatterSymbols.getById(prefs.separator),
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideScreen.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideScreen.kt
index bb22bc7a..34bbaf5c 100644
--- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideScreen.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideScreen.kt
@@ -110,7 +110,6 @@ private fun RightSideScreen(
                         }
 
                         items(units, { it.id }) {
-
                             BasicUnitListItem(
                                 modifier = Modifier.animateItemPlacement(),
                                 name = stringResource(it.displayName),
@@ -154,11 +153,10 @@ private fun formatUnitToSupportLabel(
     formatterSymbols: FormatterSymbols,
     readyCurrencies: Boolean,
 ): String {
-    try {
-        if ((unitFrom?.group == UnitGroup.CURRENCY) and !readyCurrencies) {
-            return shortName
-        }
+    if ((unitFrom?.group == UnitGroup.CURRENCY) and !readyCurrencies) return shortName
+    if (input.isEmpty()) return shortName
 
+    try {
         if ((unitFrom is DefaultUnit) and (unitTo is DefaultUnit)) {
             unitFrom as DefaultUnit
             unitTo as DefaultUnit