diff --git a/src/app.scss b/src/app.scss
index 2100cf6..7e5cba0 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -6,15 +6,21 @@
 
 :root {
   color-scheme: dark;
-}
 
-:root[dir='rtl'] {
-  .input-group > .input-group-prepend > .btn {
-    border-radius: 0 $input-border-radius $input-border-radius 0;
-  }
+  &[dir='rtl'] {
+    .input-group > .input-group-prepend > {
+      .btn,
+      .input-group-text {
+        border-radius: 0 $input-border-radius $input-border-radius 0;
+      }
+    }
 
-  .input-group > .input-group-append > .input-group-text {
-    border-radius: $input-border-radius 0 0 $input-border-radius;
+    .input-group > {
+      .form-control:last-child,
+      .input-group-append > .input-group-text {
+        border-radius: $input-border-radius 0 0 $input-border-radius;
+      }
+    }
   }
 }
 
diff --git a/src/scss/modules/TimestampPicker.module.scss b/src/scss/modules/TimestampPicker.module.scss
index 82cb327..bff49f3 100644
--- a/src/scss/modules/TimestampPicker.module.scss
+++ b/src/scss/modules/TimestampPicker.module.scss
@@ -105,17 +105,7 @@ $rdt-disabled-color: invert(#999999);
 }
 
 :root[dir='rtl'] {
-  .date-input-group {
-    flex-direction: row-reverse;
-  }
-
   .datepicker .form-label {
     text-align: right;
   }
 }
-
-:root[dir='rtl'] {
-  .date-input-group {
-    flex-direction: row-reverse;
-  }
-}