diff --git a/app/src/main/java/org/lsposed/manager/ui/dialog/WelcomeDialog.java b/app/src/main/java/org/lsposed/manager/ui/dialog/WelcomeDialog.java
index 045614c8..1a2741d5 100644
--- a/app/src/main/java/org/lsposed/manager/ui/dialog/WelcomeDialog.java
+++ b/app/src/main/java/org/lsposed/manager/ui/dialog/WelcomeDialog.java
@@ -23,7 +23,8 @@ public class WelcomeDialog extends DialogFragment {
                 .setNegativeButton(R.string.never_show, (dialog, which) ->
                         App.getPreferences().edit().putBoolean("never_show_welcome", true).apply())
                 .setNeutralButton(R.string.create_shortcut, (dialog, which) ->
-                        ShortcutUtil.requestPinLaunchShortcut(null))
+                        ShortcutUtil.requestPinLaunchShortcut(() ->
+                                App.getPreferences().edit().putBoolean("never_show_welcome", true).apply()))
                 .setPositiveButton(android.R.string.ok, null)
                 .create();
     }
diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java
index 4ba719de..3ba7454f 100644
--- a/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java
+++ b/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java
@@ -182,7 +182,6 @@ public class SettingsFragment extends BaseFragment {
                     shortcut.setEnabled(true);
                     shortcut.setSummary(R.string.settings_create_shortcut_summary);
                 }
-                shortcut.setEnabled(!ShortcutUtil.isLaunchShortcutPinned());
                 shortcut.setOnPreferenceClickListener(preference -> {
                     ShortcutUtil.requestPinLaunchShortcut(() -> {
                         shortcut.setEnabled(false);
@@ -191,6 +190,7 @@ public class SettingsFragment extends BaseFragment {
                             notification.setEnabled(true);
                             notification.setSummaryOn(R.string.settings_enable_status_notification_summary);
                         }
+                        App.getPreferences().edit().putBoolean("never_show_welcome", true).apply();
                     });
                     return true;
                 });