diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivity.kt
deleted file mode 100644
index 98687d08b..000000000
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivity.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.activities
-
-import android.content.*
-import android.os.*
-import androidx.appcompat.app.*
-import org.isoron.uhabits.*
-import org.isoron.uhabits.core.models.*
-import org.isoron.uhabits.inject.*
-
-abstract class HabitsActivity : AppCompatActivity() {
-    lateinit var component: HabitsActivityComponent
-    lateinit var appComponent: HabitsApplicationComponent
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        appComponent = (applicationContext as HabitsApplication).component
-
-        var habit = appComponent.modelFactory.buildHabit()
-        if(intent.action != "android.intent.action.VIEW") {
-            val intentHabit = getHabitFromIntent(appComponent.habitList)
-            if (intentHabit != null) habit = intentHabit
-        }
-
-        component = DaggerHabitsActivityComponent
-                .builder()
-                .activityContextModule(ActivityContextModule(this))
-                .habitsApplicationComponent(appComponent)
-                .build()
-
-        component.themeSwitcher.apply()
-    }
-
-    private fun getHabitFromIntent(habitList: HabitList): Habit? {
-        val data = intent.data ?: return null
-        val habit = habitList.getById(ContentUris.parseId(data))
-                    ?: throw RuntimeException("habit not found")
-        return habit
-    }
-}
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
index 14b3d6b92..4736e69e9 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
@@ -22,6 +22,7 @@ package org.isoron.uhabits.activities.habits.list
 import android.content.*
 import android.os.*
 import android.view.*
+import androidx.appcompat.app.*
 import kotlinx.coroutines.*
 import org.isoron.uhabits.*
 import org.isoron.uhabits.activities.*
@@ -32,9 +33,10 @@ import org.isoron.uhabits.core.tasks.*
 import org.isoron.uhabits.core.ui.ThemeSwitcher.*
 import org.isoron.uhabits.core.utils.*
 import org.isoron.uhabits.database.*
+import org.isoron.uhabits.inject.*
 import org.isoron.uhabits.utils.*
 
-class ListHabitsActivity : HabitsActivity() {
+class ListHabitsActivity : AppCompatActivity() {
 
     var pureBlack: Boolean = false
     lateinit var taskRunner: TaskRunner
@@ -50,6 +52,15 @@ class ListHabitsActivity : HabitsActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        val appComponent = (applicationContext as HabitsApplication).component
+        val component = DaggerHabitsActivityComponent
+                .builder()
+                .activityContextModule(ActivityContextModule(this))
+                .habitsApplicationComponent(appComponent)
+                .build()
+        component.themeSwitcher.apply()
+
         prefs = appComponent.preferences
         syncManager = appComponent.syncManager
         pureBlack = prefs.isPureBlackEnabled