diff --git a/app/src/main/java/com/cringe_studios/code_guard/MainActivity.java b/app/src/main/java/com/cringe_studios/code_guard/MainActivity.java
index d456f36..9db9663 100644
--- a/app/src/main/java/com/cringe_studios/code_guard/MainActivity.java
+++ b/app/src/main/java/com/cringe_studios/code_guard/MainActivity.java
@@ -23,6 +23,7 @@ import com.cringe_studios.code_guard.fragment.AboutFragment;
 import com.cringe_studios.code_guard.fragment.EditOTPFragment;
 import com.cringe_studios.code_guard.fragment.GroupFragment;
 import com.cringe_studios.code_guard.fragment.NamedFragment;
+import com.cringe_studios.code_guard.fragment.NoGroupsFragment;
 import com.cringe_studios.code_guard.fragment.SettingsFragment;
 import com.cringe_studios.code_guard.icon.IconPack;
 import com.cringe_studios.code_guard.icon.IconPackException;
@@ -260,12 +261,16 @@ public class MainActivity extends BaseActivity {
         }
     }
 
-    private void navigateToMainGroup() {
+    public void navigateToMainGroup() {
         List<String> groups = SettingsUtil.getGroups(this);
         if(!groups.isEmpty()) {
             Bundle bundle = new Bundle();
             bundle.putString(GroupFragment.BUNDLE_GROUP, SettingsUtil.getGroups(this).get(0));
             NavigationUtil.navigate(this, GroupFragment.class, bundle);
+        }else {
+            ActionBar bar = getSupportActionBar();
+            if(bar != null) bar.setTitle(R.string.app_name);
+            NavigationUtil.navigate(this, NoGroupsFragment.class, null);
         }
     }
 
diff --git a/app/src/main/java/com/cringe_studios/code_guard/fragment/GroupFragment.java b/app/src/main/java/com/cringe_studios/code_guard/fragment/GroupFragment.java
index b4026c9..5bb35fb 100644
--- a/app/src/main/java/com/cringe_studios/code_guard/fragment/GroupFragment.java
+++ b/app/src/main/java/com/cringe_studios/code_guard/fragment/GroupFragment.java
@@ -71,6 +71,10 @@ public class GroupFragment extends NamedFragment {
         return binding.getRoot();
     }
 
+    public String getGroupID() {
+        return groupID;
+    }
+
     private void saveOTPs() {
         OTPDatabase.promptLoadDatabase(requireActivity(), () -> {
             try {
diff --git a/app/src/main/java/com/cringe_studios/code_guard/fragment/MenuDrawerFragment.java b/app/src/main/java/com/cringe_studios/code_guard/fragment/MenuDrawerFragment.java
index 388973d..b69d2b9 100644
--- a/app/src/main/java/com/cringe_studios/code_guard/fragment/MenuDrawerFragment.java
+++ b/app/src/main/java/com/cringe_studios/code_guard/fragment/MenuDrawerFragment.java
@@ -7,7 +7,9 @@ import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
+import com.cringe_studios.code_guard.MainActivity;
 import com.cringe_studios.code_guard.R;
 import com.cringe_studios.code_guard.crypto.CryptoException;
 import com.cringe_studios.code_guard.databinding.FragmentMenuDrawerBinding;
@@ -70,6 +72,13 @@ public class MenuDrawerFragment extends BottomSheetDialogFragment {
             String id = UUID.randomUUID().toString();
             SettingsUtil.addGroup(requireContext(), id, groupName);
             groupListAdapter.add(id);
+
+            Fragment fragment = NavigationUtil.getCurrentFragment(getParentFragmentManager());
+            if(fragment instanceof NoGroupsFragment) {
+                Bundle bundle = new Bundle();
+                bundle.putString(GroupFragment.BUNDLE_GROUP, id);
+                NavigationUtil.navigate(this, GroupFragment.class, bundle);
+            }
         }, null);
     }
 
@@ -95,6 +104,15 @@ public class MenuDrawerFragment extends BottomSheetDialogFragment {
                 removeGroup(item.getGroupId());
             }
 
+            Fragment fragment = NavigationUtil.getCurrentFragment(getParentFragmentManager());
+            if(fragment instanceof GroupFragment) {
+                GroupFragment groupFragment = (GroupFragment) fragment;
+                if(!SettingsUtil.getGroups(requireContext()).contains(groupFragment.getGroupID())) {
+                    // Currently selected group was deleted, navigate to main group
+                    ((MainActivity) requireActivity()).navigateToMainGroup();
+                }
+            }
+
             groupListAdapter.finishEditing();
         }, null);
     }
diff --git a/app/src/main/java/com/cringe_studios/code_guard/fragment/NoGroupsFragment.java b/app/src/main/java/com/cringe_studios/code_guard/fragment/NoGroupsFragment.java
new file mode 100644
index 0000000..46f91f9
--- /dev/null
+++ b/app/src/main/java/com/cringe_studios/code_guard/fragment/NoGroupsFragment.java
@@ -0,0 +1,27 @@
+package com.cringe_studios.code_guard.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.cringe_studios.code_guard.R;
+import com.cringe_studios.code_guard.databinding.FragmentNoGroupsBinding;
+
+public class NoGroupsFragment extends NamedFragment {
+
+    @Override
+    public String getName() {
+        return requireActivity().getString(R.string.fragment_no_groups);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        FragmentNoGroupsBinding binding = FragmentNoGroupsBinding.inflate(inflater);
+        return binding.getRoot();
+    }
+}
diff --git a/app/src/main/res/layout/fragment_no_groups.xml b/app/src/main/res/layout/fragment_no_groups.xml
new file mode 100644
index 0000000..d84b304
--- /dev/null
+++ b/app/src/main/res/layout/fragment_no_groups.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".fragment.NoGroupsFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="16dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/no_groups" />
+
+    </LinearLayout>
+
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d2ad142..94d2f11 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -82,6 +82,7 @@
     <string name="fragment_settings">Einstellungen</string>
     <string name="fragment_about">Über</string>
     <string name="fragment_edit_otp">OTP bearbeiten</string>
+    <string name="fragment_no_groups">Keine Gruppen</string>
     <string name="theme_blue_green">Blau/Grün</string>
     <string name="theme_red_blue">Rot/Blau</string>
     <string name="theme_pink_green">Pink/Grün</string>
@@ -167,4 +168,5 @@
     <string name="error_duplicate_otp_title">Doppeltes OTP</string>
     <string name="biometric_encryption_unavailable">Biometrische Authentifizierung ist deaktiviert, da sie auf deinem Gerät nicht eingerichtet oder nicht verfügbar ist</string>
     <string name="locale_system_default">Systemstandard</string>
+    <string name="no_groups">Es existieren momentan keine Gruppen. Öffne das Menü und drücke auf das \'+\'-Symbol, um eine Gruppe zu erstellen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f1adc34..808f206 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,6 +66,7 @@
     <string name="fragment_settings">Settings</string>
     <string name="fragment_about">About</string>
     <string name="fragment_edit_otp">Edit OTP</string>
+    <string name="fragment_no_groups">No Groups</string>
     <string-array name="view_edit_move_delete">
         <item>View</item>
         <item>Edit</item>
@@ -173,6 +174,7 @@
     <string name="error_duplicate_otp_message">An OTP with the name of the OTP you\'re trying to add already exists.\n\nDo you want to automatically rename the new OTP to distinguish them from each other?</string>
     <string name="error_duplicate_otp_title">Duplicate OTP</string>
     <string name="biometric_encryption_unavailable">Biometric authentication is disabled because it is not set up or not available on your device</string>
+    <string name="no_groups">No groups exist yet. Open the menu and press the \'+\' button to create one</string>
     <string-array name="edit_otp_choose_image_options">
         <item>Image from icon pack</item>
         <item>Image from gallery</item>