diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index bceba50ce..6b2bdece3 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -298,6 +298,9 @@
   <!-- Button: new list -->
   <string name="FLA_new_list">New List</string>
   
+  <!-- Alert when creating a shortcut without selecting a filter -->
+  <string name="FLA_no_filter_selected">No filter selected! Please select a filter or list.</string>
+  
   <!-- ================================================= TaskEditActivity == -->
   
   <!-- Title when editing a task (%s => task title) -->
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java
index de1911d77..fa9959203 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java
@@ -9,6 +9,7 @@ import android.widget.Button;
 import android.widget.ListView;
 
 import com.timsu.astrid.R;
+import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.adapter.FilterAdapter;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.service.StatisticsService;
@@ -43,6 +44,10 @@ public class FilterShortcutActivity extends ListActivity {
     final View.OnClickListener mOnClickListener = new View.OnClickListener() {
         public void onClick(View v) {
             Filter filter = (Filter) adapter.getSelection();
+            if (filter == null) {
+                DialogUtilities.okDialog(FilterShortcutActivity.this, getString(R.string.FLA_no_filter_selected), null);
+                return;
+            }
             Intent shortcutIntent = ShortcutActivity.createIntent(
                     (Filter) filter);