diff --git a/app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java b/app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java
index da6ff522f..6c0430bd2 100644
--- a/app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java
@@ -7,7 +7,6 @@ import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.Typeface;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Vibrator;
 import android.util.DisplayMetrics;
@@ -61,8 +60,8 @@ public class ListHabitsFragment extends Fragment
     TextView tvNameHeader;
     long lastLongClick = 0;
     private int tvNameWidth;
-
     private int button_count;
+    private View llEmpty;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -95,16 +94,11 @@ public class ListHabitsFragment extends Fragment
         listView.setOnTouchListener(controller);
         listView.setDragEnabled(true);
 
-        if (Habit.getCount() == 0)
-        {
-            Log.d("x", "Removing listView");
-            Typeface fontawesome =
-                    Typeface.createFromAsset(getActivity().getAssets(), "fontawesome-webfont.ttf");
-
-            ((TextView) view.findViewById(R.id.tvStarEmpty)).setTypeface(fontawesome);
-
-            ((ViewGroup) listView.getParent()).removeView(listView);
-        }
+        Typeface fontawesome =
+                Typeface.createFromAsset(getActivity().getAssets(), "fontawesome-webfont.ttf");
+        ((TextView) view.findViewById(R.id.tvStarEmpty)).setTypeface(fontawesome);
+        llEmpty = view.findViewById(R.id.llEmpty);
+        updateEmptyMessage();
 
         GregorianCalendar day = new GregorianCalendar(TimeZone.getTimeZone("GMT"));
         day.setTimeInMillis(DateHelper.getStartOfDay(DateHelper.getLocalTime()));
@@ -198,9 +192,16 @@ public class ListHabitsFragment extends Fragment
 
     public void notifyDataSetChanged()
     {
+        updateEmptyMessage();
         adapter.notifyDataSetChanged();
     }
 
+    private void updateEmptyMessage()
+    {
+        Log.d("x", "updating empty message");
+        llEmpty.setVisibility(Habit.getCount() > 0 ? View.GONE : View.VISIBLE);
+    }
+
     @Override
     public boolean onLongClick(View v)
     {
diff --git a/app/src/main/res/layout/edit_habit.xml b/app/src/main/res/layout/edit_habit.xml
index 714f7337d..58cd07556 100644
--- a/app/src/main/res/layout/edit_habit.xml
+++ b/app/src/main/res/layout/edit_habit.xml
@@ -29,7 +29,7 @@
 
         <EditText
             android:id="@+id/input_description"
-            android:hint="@string/description"
+            android:hint="@string/description_hint"
             style="@style/dialogFormInputMultiline" />
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_habits_fragment.xml b/app/src/main/res/layout/list_habits_fragment.xml
index f9243ec7a..f458d0c2b 100644
--- a/app/src/main/res/layout/list_habits_fragment.xml
+++ b/app/src/main/res/layout/list_habits_fragment.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dslv="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#ffffff">
+                xmlns:dslv="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#ffffff">
 
     <com.mobeta.android.dslv.DragSortListView
         android:id="@+id/listView"
@@ -18,7 +18,7 @@
         />
 
     <LinearLayout
-        android:id="@+id/tvEmpty"
+        android:id="@+id/llEmpty"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
@@ -31,27 +31,25 @@
             android:textSize="80sp"/>
 
         <TextView
-            android:text="@string/no_habits_found"
-            style="@style/habitsListEmptyStyle"/>
+            style="@style/habitsListEmptyStyle"
+            android:text="@string/no_habits_found"/>
 
     </LinearLayout>
 
-
-
     <LinearLayout style="@style/habitsListHeaderStyle">
 
         <TextView
             android:id="@+id/tvStarHeader"
-            style="@style/habitsListStarStyle" />
+            style="@style/habitsListStarStyle"/>
 
         <TextView
             android:id="@+id/tvNameHeader"
             style="@style/habitsListNameStyle"
-            android:text="" />
+            android:text=""/>
 
         <LinearLayout
             android:id="@+id/llButtonsHeader"
-            style="@style/habitsListButtonsPanelStyle" />
+            style="@style/habitsListButtonsPanelStyle"/>
     </LinearLayout>
 
 </RelativeLayout>
\ 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 acfd1e854..1a407735c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -47,6 +47,7 @@
     <string name="history">History</string>
     <string name="clear">Clear</string>
     <string name="description">Description</string>
+    <string name="description_hint">Description</string>
     <string name="repeat">Repeat</string>
     <string name="default_freq_num">3</string>
     <string name="times_every">times every</string>