diff --git a/src/components/organisms/Carousel.svelte b/src/components/organisms/Carousel.svelte
index 46e2db7..a279dc6 100644
--- a/src/components/organisms/Carousel.svelte
+++ b/src/components/organisms/Carousel.svelte
@@ -54,7 +54,12 @@
     const handleArrowClick = () => {
         if (!carousel.clickAllowed()) return
 
-        // TODO: Clicking should also define arrowDirection? Can click without moving and won't change direction
+        // Define direction
+        if (isFirstSlide) {
+            arrowDirection = 'next'
+        } else if (isLastSlide) {
+            arrowDirection = 'prev'
+        }
 
         // Click only if carousel if being dragged
         if (arrowDirection === 'prev') {