diff --git a/app/src/main/java/xtr/keymapper/editor/EditorService.java b/app/src/main/java/xtr/keymapper/editor/EditorService.java
index 1626dc5c..8baa148f 100644
--- a/app/src/main/java/xtr/keymapper/editor/EditorService.java
+++ b/app/src/main/java/xtr/keymapper/editor/EditorService.java
@@ -1,13 +1,11 @@
 package xtr.keymapper.editor;
 
- import android.app.ActivityOptions;
-import android.app.Service;
+ import android.app.Service;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.IBinder;
+ import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
 
@@ -51,9 +49,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         if (keymapConfig.editorOverlay) {
             bindService(new Intent(this, TouchPointer.class), connection, Context.BIND_AUTO_CREATE);
         } else {
-            intent = new Intent(this, EditorActivity.class);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(intent);
+            Intent newIntent = new Intent(getApplicationContext(), EditorActivity.class);
+            newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            startActivity(newIntent);
         }
 
         return super.onStartCommand(intent, flags, startId);