diff --git a/app/build.gradle b/app/build.gradle
index 05fda282b672cabd56043963d8cedad63dab5df6..a6c77a831898bba48f9b7b44950cb3dce38cf90b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 22
         versionCode 20
-        versionName "1.5.0"
+        versionName "1.5.4"
     }
 
     signingConfigs {
diff --git a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
index f77620bed5460f5ab0fa11edc4aad265e2890970..941cb675c0af8b0810bfabf117da1c3474fe5b97 100644
--- a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
@@ -76,12 +76,13 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
 
         startRobotService()
 
+        startBtn.isEnabled = !TaskManager.instance.isRunning
         startBtn.setOnClickListener{
             start()
         }
         startBtn.requestFocus()
 
-        stopBtn.isEnabled = false
+        stopBtn.isEnabled = TaskManager.instance.isRunning
         stopBtn.setOnClickListener{
             stop()
         }