diff --git a/app/src/main/java/io/github/dovecoteescapee/byedpi/fragments/ByeDpiCommandLineSettingsFragment.kt b/app/src/main/java/io/github/dovecoteescapee/byedpi/fragments/ByeDpiCommandLineSettingsFragment.kt
index 63b4fc90..e8424a3a 100644
--- a/app/src/main/java/io/github/dovecoteescapee/byedpi/fragments/ByeDpiCommandLineSettingsFragment.kt
+++ b/app/src/main/java/io/github/dovecoteescapee/byedpi/fragments/ByeDpiCommandLineSettingsFragment.kt
@@ -1,11 +1,173 @@
 package io.github.dovecoteescapee.byedpi.fragments
 
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
 import android.os.Bundle
-import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.*
 import io.github.dovecoteescapee.byedpi.R
+import io.github.dovecoteescapee.byedpi.utility.findPreferenceNotNull
+import androidx.appcompat.app.AlertDialog
 
 class ByeDpiCommandLineSettingsFragment : PreferenceFragmentCompat() {
+
+    private val historyKey = "byedpi_cmd_history"
+    private val pinnedHistoryKey = "byedpi_cmd_pinned_history"
+    private val maxHistorySize = 20
+
+    private lateinit var editTextPreference: EditTextPreference
+    private lateinit var historyCategory: PreferenceCategory
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.byedpi_cmd_settings, rootKey)
+
+        editTextPreference = findPreferenceNotNull("byedpi_cmd_args")
+        historyCategory = findPreferenceNotNull("cmd_history_category")
+
+        editTextPreference.setOnPreferenceChangeListener { _, newValue ->
+            val newCommand = newValue.toString()
+            addToHistory(newCommand)
+            true
+        }
+
+        loadHistory()
+    }
+
+    private fun addToHistory(command: String) {
+        val sharedPreferences = getSharedPreferences()
+        val history = getHistory(sharedPreferences)
+
+        history.remove(command)
+        history.add(0, command)
+        if (history.size > maxHistorySize) {
+            history.removeAt(maxHistorySize)
+        }
+
+        saveHistory(sharedPreferences, history, historyKey)
+        updateHistoryCategory()
+    }
+
+    private fun getSharedPreferences() =
+        PreferenceManager.getDefaultSharedPreferences(requireContext())
+
+    private fun getHistory(sharedPreferences: android.content.SharedPreferences) =
+        sharedPreferences.getStringSet(historyKey, emptySet())?.toMutableList() ?: mutableListOf()
+
+    private fun getPinnedHistory(sharedPreferences: android.content.SharedPreferences) =
+        sharedPreferences.getStringSet(pinnedHistoryKey, emptySet())?.toMutableList() ?: mutableListOf()
+
+    private fun saveHistory(sharedPreferences: android.content.SharedPreferences, history: List<String>, key: String) {
+        sharedPreferences.edit().putStringSet(key, history.toSet()).apply()
+    }
+
+    private fun loadHistory() {
+        updateHistoryCategory()
+    }
+
+    private fun updateHistoryCategory() {
+        historyCategory.removeAll()
+        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
+        val history = getHistory(sharedPreferences)
+        val pinnedHistory = getPinnedHistory(sharedPreferences)
+
+        pinnedHistory.forEach { command ->
+            val preference = createPreference(command, isPinned = true)
+            historyCategory.addPreference(preference)
+        }
+
+        history.forEach { command ->
+            if (command !in pinnedHistory) {
+                val preference = createPreference(command, isPinned = false)
+                historyCategory.addPreference(preference)
+            }
+        }
+    }
+
+    private fun createPreference(command: String, isPinned: Boolean) =
+        Preference(requireContext()).apply {
+            title = command
+            summary = if (isPinned) context.getString(R.string.cmd_history_pinned) else null
+            setOnPreferenceClickListener {
+                showActionDialog(command, isPinned)
+                true
+            }
+        }
+
+    private fun showActionDialog(command: String, isPinned: Boolean) {
+        val options = arrayOf(
+            getString(R.string.cmd_history_apply),
+            if (isPinned) getString(R.string.cmd_history_unpin) else getString(R.string.cmd_history_pin),
+            getString(R.string.cmd_history_copy),
+            getString(R.string.cmd_history_delete)
+        )
+
+        AlertDialog.Builder(requireContext())
+            .setTitle(getString(R.string.cmd_history_menu))
+            .setItems(options) { _, which ->
+                when (which) {
+                    0 -> applyCommand(command)
+                    1 -> if (isPinned) unpinCommand(command) else pinCommand(command)
+                    2 -> copyToClipboard(command)
+                    3 -> deleteCommand(command)
+                }
+            }
+            .show()
+    }
+
+    private fun applyCommand(command: String) {
+        editTextPreference.text = command
+    }
+
+    private fun pinCommand(command: String) {
+        val sharedPreferences = getSharedPreferences()
+        val history = getHistory(sharedPreferences)
+        val pinnedHistory = getPinnedHistory(sharedPreferences)
+
+        if (command in history) {
+            history.remove(command)
+        }
+
+        if (command !in pinnedHistory) {
+            pinnedHistory.add(command)
+            saveHistory(sharedPreferences, pinnedHistory, pinnedHistoryKey)
+        }
+
+        updateHistoryCategory()
+    }
+
+    private fun unpinCommand(command: String) {
+        val sharedPreferences = getSharedPreferences()
+        val pinnedHistory = getPinnedHistory(sharedPreferences)
+
+        if (command in pinnedHistory) {
+            pinnedHistory.remove(command)
+            saveHistory(sharedPreferences, pinnedHistory, pinnedHistoryKey)
+        }
+
+        updateHistoryCategory()
+    }
+
+    private fun deleteCommand(command: String) {
+        val sharedPreferences = getSharedPreferences()
+        val history = getHistory(sharedPreferences)
+        val pinnedHistory = getPinnedHistory(sharedPreferences)
+
+        if (command in history) {
+            history.remove(command)
+            saveHistory(sharedPreferences, history, historyKey)
+        }
+
+        if (command in pinnedHistory) {
+            pinnedHistory.remove(command)
+            saveHistory(sharedPreferences, pinnedHistory, pinnedHistoryKey)
+        }
+
+        updateHistoryCategory()
+    }
+
+    private fun copyToClipboard(command: String) {
+        val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        val clip = ClipData.newPlainText("Command", command)
+        clipboard.setPrimaryClip(clip)
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 68d3d1bf..dbfbabf1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -82,4 +82,12 @@
     <string name="applist_setting">Фильтр приложений</string>
     <string name="apps_select">Выбрать приложения</string>
     <string name="search_apps">Поиск приложений</string>
+    <string name="cmd_history_title">История комманд</string>
+    <string name="cmd_history_menu">Выберите действие</string>
+    <string name="cmd_history_apply">Применить</string>
+    <string name="cmd_history_copy">Копировать</string>
+    <string name="cmd_history_pin">Закрепить</string>
+    <string name="cmd_history_unpin">Открепить</string>
+    <string name="cmd_history_pinned">Закреплено</string>
+    <string name="cmd_history_delete">Удалить</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/byedpi_cmd_settings.xml b/app/src/main/res/xml/byedpi_cmd_settings.xml
index 5d45e09b..5051f0e2 100644
--- a/app/src/main/res/xml/byedpi_cmd_settings.xml
+++ b/app/src/main/res/xml/byedpi_cmd_settings.xml
@@ -13,15 +13,15 @@
             android:data="@string/byedpi_docs" />
     </Preference>
 
-    <androidx.preference.PreferenceCategory>
+    <com.takisoft.preferencex.EditTextPreference
+        android:key="byedpi_cmd_args"
+        android:title="@string/command_line_arguments"
+        android:dialogTitle="@string/command_line_arguments"
+        android:inputType="textMultiLine"
+        app:useSimpleSummaryProvider="true" />
 
-        <com.takisoft.preferencex.EditTextPreference
-            android:key="byedpi_cmd_args"
-            android:title="@string/command_line_arguments"
-            android:dialogTitle="@string/command_line_arguments"
-            android:inputType="textMultiLine"
-            app:useSimpleSummaryProvider="true" />
-
-    </androidx.preference.PreferenceCategory>
+    <androidx.preference.PreferenceCategory
+        android:key="cmd_history_category"
+        android:title="@string/cmd_history_title" />
 
 </PreferenceScreen>