diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fb017102b..f6e311248 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -126,23 +126,12 @@
             android:theme="@android:style/Theme.NoDisplay" />
         <activity android:name=".ErrorActivity"/>
 
+        <!-- giga get related -->
         <activity
             android:name=".download.MainActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme"
             android:launchMode="singleTask">
-            <intent-filter>
-                <action android:name="us.shandian.giga.intent.DOWNLOAD"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data
-                    android:mimeType="application/*"
-                    android:host="*"
-                    android:scheme="http"/>
-                <data
-                    android:mimeType="application/*"
-                    android:host="*"
-                    android:scheme="https"/>
-            </intent-filter>
         </activity>
 
         <service
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
index 054376d69..273c5c971 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
@@ -368,7 +368,8 @@ public class VideoItemListActivity extends AppCompatActivity
                 return true;
             }
             case R.id.action_show_downloads: {
-                //todo: implement this
+                Intent intent = new Intent(this, org.schabi.newpipe.download.MainActivity.class);
+                startActivity(intent);
                 return true;
             }
             default:
diff --git a/app/src/main/java/org/schabi/newpipe/download/MainActivity.java b/app/src/main/java/org/schabi/newpipe/download/MainActivity.java
index 52da105e5..6f064d94b 100644
--- a/app/src/main/java/org/schabi/newpipe/download/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/MainActivity.java
@@ -115,7 +115,7 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
         });
 
         // Intent
-        if (getIntent().getAction().equals(INTENT_DOWNLOAD)) {
+        if (getIntent().getAction() != null && getIntent().getAction().equals(INTENT_DOWNLOAD)) {
             mPendingUrl = getIntent().getData().toString();
         }
     }