diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index cd6fb798..731bfd44 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -60,6 +60,12 @@ public abstract class BaseActivity extends AppCompatActivity {
 
         }
 
+        // enabling counter badges by default
+        if(tinyDb.getString("enableCounterBadgesInit").isEmpty()) {
+            tinyDb.putBoolean("enableCounterBadges", true);
+            tinyDb.putString("enableCounterBadgesInit", "yes");
+        }
+
     }
 
     protected abstract int getLayoutResourceId();
diff --git a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
index d21214dd..c84ac9c4 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
@@ -99,9 +99,9 @@ public class SettingsFragment extends Fragment {
 			homeScreenSelected.setText(tinyDb.getString("homeScreenStr"));
 		}
 
-		if(!tinyDb.getString("customFontStr").isEmpty()) {
-			customFontSelected.setText(tinyDb.getString("customFontStr"));
-		}
+        if(!tinyDb.getString("customFontStr").isEmpty()) {
+            customFontSelected.setText(tinyDb.getString("customFontStr"));
+        }
 
 		if(!tinyDb.getString("themeStr").isEmpty()) {
 			themeSelected.setText(tinyDb.getString("themeStr"));
@@ -167,16 +167,14 @@ public class SettingsFragment extends Fragment {
 		// counter badge switcher
 		counterBadgesSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
-			if(isChecked) {
-				tinyDb.putBoolean("enableCounterBadges", true);
-				tinyDb.putString("enableCounterBadgesInit", "yes");
-				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
-			}
-			else {
-				tinyDb.putBoolean("enableCounterBadges", false);
-				tinyDb.putString("enableCounterBadgesInit", "yes");
-				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
-			}
+            if (isChecked) {
+                tinyDb.putBoolean("enableCounterBadges", true);
+                Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+            }
+            else {
+                tinyDb.putBoolean("enableCounterBadges", false);
+                Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+            }
 
 		});