diff --git a/src/com/android/settings/dashboard/SupportFragment.java b/src/com/android/settings/dashboard/SupportFragment.java
index 2e4fedc..c4d74ef 100644
--- a/src/com/android/settings/dashboard/SupportFragment.java
+++ b/src/com/android/settings/dashboard/SupportFragment.java
@@ -19,6 +19,7 @@
 import android.annotation.DrawableRes;
 import android.annotation.IdRes;
 import android.annotation.StringRes;
+import android.app.Activity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -28,13 +29,17 @@
 
 import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.overlay.SupportFeatureProvider;
 
 /**
  * Fragment for support tab in SettingsGoogle.
  */
-public final class SupportFragment extends InstrumentedFragment {
+public final class SupportFragment extends InstrumentedFragment implements View.OnClickListener {
 
+    private Activity mActivity;
     private View mContent;
+    private SupportFeatureProvider mSupportFeatureProvider;
 
     @Override
     protected int getMetricsCategory() {
@@ -42,6 +47,14 @@
     }
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mActivity = getActivity();
+        mSupportFeatureProvider =
+                FeatureFactory.getFactory(getContext()).getSupportFeatureProvider();
+    }
+
+    @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         mContent = inflater.inflate(R.layout.support_fragment, container, false);
@@ -67,5 +80,15 @@
         final View tile = mContent.findViewById(tileId);
         ((ImageView) tile.findViewById(android.R.id.icon)).setImageResource(icon);
         ((TextView) tile.findViewById(android.R.id.title)).setText(title);
+        tile.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.forum_tile:
+                mActivity.startActivity(mSupportFeatureProvider.getForumIntent());
+                break;
+        }
     }
 }
diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java
index 3b654f4..71f0876 100644
--- a/src/com/android/settings/overlay/SupportFeatureProvider.java
+++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -1,8 +1,31 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.android.settings.overlay;
 
+import android.content.Intent;
+
 /**
  * Feature provider for support tab.
  */
 public interface SupportFeatureProvider {
 
+    /**
+     * Returns a intent that will open help forum.
+     */
+    Intent getForumIntent();
+
 }
