diff --git a/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java b/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java
index f065b49..3b5ac7e 100644
--- a/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java
+++ b/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java
@@ -120,14 +120,17 @@ public class MainActivity extends AppCompatActivity {
                         viewPager2.setCurrentItem(1);
                         break;
                     case R.id.activity_basket:
-                        viewPager2.setCurrentItem(2);
+                        if(Common.CURRENT_USER != null){
+                            viewPager2.setCurrentItem(2);
+                        } else {
+                            startActivity(new Intent(MainActivity.this, SignInActivity.class));
+                        }
                         break;
                     case R.id.activity_profile:
                         if(Common.CURRENT_USER != null){
                             viewPager2.setCurrentItem(3);
                         } else {
                             startActivity(new Intent(MainActivity.this, SignInActivity.class));
-                            finish();
                         }
                         break;
                 }
diff --git a/app/src/main/java/com/capstone/foodify/Fragment/BasketFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/BasketFragment.java
index 8152d44..ec0b8c0 100644
--- a/app/src/main/java/com/capstone/foodify/Fragment/BasketFragment.java
+++ b/app/src/main/java/com/capstone/foodify/Fragment/BasketFragment.java
@@ -19,6 +19,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.capstone.foodify.Activity.OrderCheckOutActivity;
+import com.capstone.foodify.Activity.SignInActivity;
 import com.capstone.foodify.Common;
 import com.capstone.foodify.ItemTouchHelperListener;
 import com.capstone.foodify.Model.Basket;