diff --git a/app/src/main/java/com/heller/calculator/ui/components/CalculatorButton.kt b/app/src/main/java/com/heller/calculator/ui/components/CalculatorButton.kt
index 0622b8f..acb62e3 100644
--- a/app/src/main/java/com/heller/calculator/ui/components/CalculatorButton.kt
+++ b/app/src/main/java/com/heller/calculator/ui/components/CalculatorButton.kt
@@ -1,8 +1,6 @@
 package com.heller.calculator.ui.components
 
 import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -12,10 +10,8 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
@@ -69,13 +65,8 @@ fun CalculatorButton(
 
     if (type == CalculatorButtonType.Digit) {
         Surface(
-            modifier = modifier
-                .clip(shape)
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = onClick,
-                ),
+            onClick = onClick,
+            modifier = modifier,
             shape = shape,
             color = containerColor,
             shadowElevation = 2.dp,