diff --git a/app/src/main/kotlin/jackall/overlaymulticounter/contract/CounterContract.kt b/app/src/main/kotlin/jackall/overlaymulticounter/contract/CounterContract.kt
index a70ccde..4955313 100644
--- a/app/src/main/kotlin/jackall/overlaymulticounter/contract/CounterContract.kt
+++ b/app/src/main/kotlin/jackall/overlaymulticounter/contract/CounterContract.kt
@@ -7,4 +7,5 @@
     fun plus(id: Int)
     fun minus(id: Int)
     fun reset(id: Int)
+    fun editTitle(id: Int, title: String)
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/jackall/overlaymulticounter/db/CounterRealmHelper.kt b/app/src/main/kotlin/jackall/overlaymulticounter/db/CounterRealmHelper.kt
index ae0ed05..aba64bb 100644
--- a/app/src/main/kotlin/jackall/overlaymulticounter/db/CounterRealmHelper.kt
+++ b/app/src/main/kotlin/jackall/overlaymulticounter/db/CounterRealmHelper.kt
@@ -44,6 +44,13 @@
         }
     }
 
+    fun updateTitle(id: Int, title: String) {
+        realm.executeTransaction {
+            val counter = realm.where(Counter::class.java).equalTo("id", id).findFirst()
+            counter.title = title
+        }
+    }
+
     fun resetAll() {
         realm.executeTransaction {
             findAll().forEach {
diff --git a/app/src/main/kotlin/jackall/overlaymulticounter/service/MainService.kt b/app/src/main/kotlin/jackall/overlaymulticounter/service/MainService.kt
index 8dcd3be..85a15a3 100644
--- a/app/src/main/kotlin/jackall/overlaymulticounter/service/MainService.kt
+++ b/app/src/main/kotlin/jackall/overlaymulticounter/service/MainService.kt
@@ -112,8 +112,6 @@
                     WindowManager.LayoutParams.MATCH_PARENT,
                     WindowManager.LayoutParams.MATCH_PARENT,
                     WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
-                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
-                            WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or
                             WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
                             WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH,
                     PixelFormat.TRANSLUCENT)
@@ -122,8 +120,6 @@
                     WindowManager.LayoutParams.MATCH_PARENT,
                     WindowManager.LayoutParams.MATCH_PARENT,
                     WindowManager.LayoutParams.TYPE_SYSTEM_ALERT,
-                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
-                            WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or
                             WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
                             WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH,
                     PixelFormat.TRANSLUCENT)
diff --git a/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/CounterItemViewModel.kt b/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/CounterItemViewModel.kt
index 53e6a49..4259a4d 100644
--- a/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/CounterItemViewModel.kt
+++ b/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/CounterItemViewModel.kt
@@ -2,6 +2,7 @@
 
 import android.databinding.BaseObservable
 import android.databinding.ObservableField
+import android.databinding.ObservableInt
 import android.view.View
 import io.realm.RealmChangeListener
 import jackall.overlaymulticounter.contract.CounterContract
@@ -14,6 +15,11 @@
     val id = counter.id
     val title = ObservableField<String>(counter.title)
     val count = ObservableField<String>(counter.count.toString())
+    val titleVisible = ObservableInt(View.VISIBLE)
+    val editIconVisible = ObservableInt(View.VISIBLE)
+    val checkEditIconVisible = ObservableInt(View.INVISIBLE)
+    val editTextVisible = ObservableInt(View.INVISIBLE)
+    val editText = ObservableField<String>()
     val realmChangeListener = RealmChangeListener<Counter> {
         if (it.isValid) {
             title.set(it.title)
@@ -36,4 +42,20 @@
     fun onClickReset(view: View) {
         counterContract.reset(id)
     }
+
+    fun onClickEdit(view: View) {
+        titleVisible.set(View.INVISIBLE)
+        editTextVisible.set(View.VISIBLE)
+        editIconVisible.set(View.INVISIBLE)
+        checkEditIconVisible.set(View.VISIBLE)
+        editText.set(title.get())
+    }
+
+    fun onClickCheckEdit(view: View) {
+        counterContract.editTitle(id, editText.get())
+        titleVisible.set(View.VISIBLE)
+        editTextVisible.set(View.INVISIBLE)
+        editIconVisible.set(View.VISIBLE)
+        checkEditIconVisible.set(View.INVISIBLE)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/OverlayCounterViewModel.kt b/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/OverlayCounterViewModel.kt
index 63ba6d3..b17683b 100644
--- a/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/OverlayCounterViewModel.kt
+++ b/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/OverlayCounterViewModel.kt
@@ -72,6 +72,10 @@
         counterRealmHelper.reset(id)
     }
 
+    override fun editTitle(id: Int, title: String) {
+        counterRealmHelper.updateTitle(id, title)
+    }
+
     fun onDestory() {
         counterRealmHelper.close()
     }
diff --git a/app/src/main/res/drawable-v24/check_edit.png b/app/src/main/res/drawable-v24/check_edit.png
new file mode 100644
index 0000000..81ac996
--- /dev/null
+++ b/app/src/main/res/drawable-v24/check_edit.png
Binary files differ
diff --git a/app/src/main/res/drawable-v24/edit.png b/app/src/main/res/drawable-v24/edit.png
new file mode 100644
index 0000000..b53d65d
--- /dev/null
+++ b/app/src/main/res/drawable-v24/edit.png
Binary files differ
diff --git a/app/src/main/res/layout/list_counter_item.xml b/app/src/main/res/layout/list_counter_item.xml
index 57a1037..b51f3f4 100644
--- a/app/src/main/res/layout/list_counter_item.xml
+++ b/app/src/main/res/layout/list_counter_item.xml
@@ -38,6 +38,7 @@
             android:layout_width="@dimen/counter_count_width"
             android:layout_height="wrap_content"
             android:text="@{counterItemViewModel.count}"
+            android:textSize="@dimen/counter_count_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/counter_plus"
             app:layout_constraintTop_toTopOf="parent" />
@@ -63,13 +64,56 @@
             app:layout_constraintStart_toEndOf="@id/counter_minus"
             app:layout_constraintTop_toTopOf="parent">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@{counterItemViewModel.title}"
+            <ImageView
+                android:id="@+id/counter_edit_title"
+                android:layout_width="@dimen/counter_edit_icon_size"
+                android:layout_height="@dimen/counter_edit_icon_size"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:adjustViewBounds="true"
+                android:onClick="@{counterItemViewModel.onClickEdit}"
+                android:src="@drawable/edit"
+                android:visibility="@{counterItemViewModel.editIconVisible}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/counter_check_edit_title"
+                android:layout_width="@dimen/counter_edit_icon_size"
+                android:layout_height="@dimen/counter_edit_icon_size"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:adjustViewBounds="true"
+                android:onClick="@{counterItemViewModel.onClickCheckEdit}"
+                android:src="@drawable/check_edit"
+                android:visibility="@{counterItemViewModel.checkEditIconVisible}"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginStart="4dp"
+                android:gravity="center_vertical"
+                android:text="@{counterItemViewModel.title}"
+                android:visibility="@{counterItemViewModel.titleVisible}"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/counter_edit_title"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <EditText
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginStart="4dp"
+                android:text="@={counterItemViewModel.editText}"
+                android:visibility="@{counterItemViewModel.editTextVisible}"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/counter_edit_title"
+                app:layout_constraintTop_toTopOf="parent" />
         </android.support.constraint.ConstraintLayout>
 
     </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/overlay_counter.xml b/app/src/main/res/layout/overlay_counter.xml
index 51aa833..ed797ef 100644
--- a/app/src/main/res/layout/overlay_counter.xml
+++ b/app/src/main/res/layout/overlay_counter.xml
@@ -16,6 +16,7 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="#cbffffff"
         android:paddingTop="@dimen/status_bar_height">
 
         <Button
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index dd3b17e..bfff568 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,7 +5,9 @@
     <dimen name="overlay_layout_margin">8dp</dimen>
     <dimen name="counter_plus_width">48dp</dimen>
     <dimen name="counter_minus_width">32dp</dimen>
-    <dimen name="counter_count_width">84dp</dimen>
+    <dimen name="counter_count_width">72dp</dimen>
     <dimen name="overlay_counter_text_size">10dp</dimen>
+    <dimen name="counter_count_text_size">24dp</dimen>
     <dimen name="overlay_counter_button_width">72dp</dimen>
+    <dimen name="counter_edit_icon_size">18dp</dimen>
 </resources>
\ No newline at end of file