diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f5bab2d7..5d645c96 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,6 +29,12 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="otpauth" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".ui.ScannerActivity"
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
index 9f848491..6ac91b2b 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
@@ -402,6 +402,33 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         intent.removeExtra("action");
     }
 
+    private void handleDeeplink() {
+        if (_db.isLocked()) {
+            return;
+        }
+        
+        Intent intent = getIntent();
+        if (Intent.ACTION_VIEW.equals(intent.getAction())) {
+            Uri uri = intent.getData();
+            getIntent().setData(null);
+            getIntent().setAction(null);
+
+            GoogleAuthInfo info = null;
+            try {
+                info = GoogleAuthInfo.parseUri(uri);
+            } catch (GoogleAuthInfoException e) {
+                Toast.makeText(this, getString(R.string.unable_to_read_qrcode), Toast.LENGTH_SHORT).show();
+                e.printStackTrace();
+            }
+
+            if (info != null) {
+                DatabaseEntry entry = new DatabaseEntry(info);
+                startEditProfileActivity(CODE_ADD_ENTRY, entry, true);
+            }
+        }
+
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -431,6 +458,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             loadEntries();
         }
 
+        handleDeeplink();
         updateLockIcon();
         doShortcutActions();
     }