diff --git a/src/managers/flatpak.rs b/src/managers/flatpak.rs
new file mode 100644
index 0000000..b11aa28
--- /dev/null
+++ b/src/managers/flatpak.rs
@@ -0,0 +1,252 @@
+use crate::managers::{Package, PackageManager, SEARCH_CACHE};
+use ratatui::DefaultTerminal;
+use std::collections::{HashMap, HashSet};
+use std::process::Command;
+
+pub struct FlatpakManager;
+
+impl PackageManager for FlatpakManager {
+    fn name(&self) -> &str {
+        "Flatpak"
+    }
+
+    fn search(&self, query: &str) -> Vec<Package> {
+        if query.is_empty() {
+            return Vec::new();
+        }
+
+        let config = crate::config::Config::load();
+        let max = config.settings.max_search_results;
+        let cache_key = format!("flatpak:{}", query);
+
+        {
+            let cache = SEARCH_CACHE.lock().unwrap();
+            if let Some(cached) = cache.get(&cache_key) {
+                return cached.clone();
+            }
+        }
+
+        let output = Command::new("flatpak").args(["search", query]).output().ok();
+
+        let Some(output) = output else {
+            return Vec::new();
+        };
+
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        let mut results = Vec::new();
+
+        for line in stdout.lines().skip(1) {
+            let columns: Vec<&str> = line.split('\t').collect();
+
+            if columns.len() < 3 {
+                continue;
+            }
+
+            let name = columns.first().unwrap_or(&"").trim();
+            let description = columns.get(1).unwrap_or(&"").trim();
+            let app_id = columns.get(2).unwrap_or(&"").trim();
+            let version = columns.get(3).unwrap_or(&"").trim();
+
+            if app_id.is_empty() {
+                continue;
+            }
+
+            let score = crate::fuzzy::fuzzy_match(query, name)
+                .max(crate::fuzzy::fuzzy_match(query, app_id));
+
+            if score <= 0.01 {
+                continue;
+            }
+
+            results.push(Package {
+                provider: "flatpak".to_string(),
+                name: app_id.to_string(),
+                version: version.to_string(),
+                description: description.to_string(),
+                score,
+            });
+        }
+
+        results.sort_by(|a, b| b.score.partial_cmp(&a.score).unwrap_or(std::cmp::Ordering::Equal));
+        results.truncate(max);
+
+        {
+            let mut cache = SEARCH_CACHE.lock().unwrap();
+            cache.insert(cache_key, results.clone());
+        }
+
+        results
+    }
+
+    fn get_installed(&self) -> HashSet<String> {
+        let output =
+            Command::new("flatpak").args(["list", "--app", "--columns=application"]).output().ok();
+
+        let Some(output) = output else {
+            return HashSet::new();
+        };
+
+        String::from_utf8_lossy(&output.stdout)
+            .lines()
+            .map(str::trim)
+            .filter(|line| !line.is_empty())
+            .map(str::to_string)
+            .collect()
+    }
+
+    fn get_installed_details(&self) -> Vec<Package> {
+        let output = Command::new("flatpak")
+            .args(["list", "--app", "--columns=application,version"])
+            .output()
+            .ok();
+
+        let Some(output) = output else {
+            return Vec::new();
+        };
+
+        String::from_utf8_lossy(&output.stdout)
+            .lines()
+            .filter_map(|line| {
+                let columns: Vec<&str> = line.split('\t').collect();
+                let app_id = columns.first()?.trim();
+
+                if app_id.is_empty() {
+                    return None;
+                }
+
+                let version = columns.get(1).unwrap_or(&"").trim();
+
+                Some(Package {
+                    provider: "flatpak".to_string(),
+                    name: app_id.to_string(),
+                    version: version.to_string(),
+                    description: String::new(),
+                    score: 1.0,
+                })
+            })
+            .collect()
+    }
+
+    fn get_updates(&self) -> Vec<Package> {
+        let output = Command::new("flatpak")
+            .args(["remote-ls", "--updates", "--columns=application,version"])
+            .output()
+            .ok();
+
+        let Some(output) = output else {
+            return Vec::new();
+        };
+
+        String::from_utf8_lossy(&output.stdout)
+            .lines()
+            .filter_map(|line| {
+                let columns: Vec<&str> = line.split('\t').collect();
+                let app_id = columns.first()?.trim();
+
+                if app_id.is_empty() {
+                    return None;
+                }
+
+                let version = columns.get(1).unwrap_or(&"").trim();
+
+                Some(Package {
+                    provider: "flatpak".to_string(),
+                    name: app_id.to_string(),
+                    version: version.to_string(),
+                    description: String::new(),
+                    score: 1.0,
+                })
+            })
+            .collect()
+    }
+
+    fn get_details(&self, pkg: &str, _provider: &str) -> Option<HashMap<String, String>> {
+        {
+            let cache = crate::managers::DETAILS_CACHE.lock().unwrap();
+            if let Some(cached) = cache.get(pkg) {
+                return Some(cached.clone());
+            }
+        }
+
+        let output = Command::new("flatpak").args(["info", pkg]).output().ok()?;
+
+        if !output.status.success() {
+            return None;
+        }
+
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        let mut details = HashMap::new();
+
+        details.insert("Application ID".to_string(), pkg.to_string());
+
+        for line in stdout.lines() {
+            if let Some((key, value)) = line.split_once(':') {
+                let key = key.trim();
+                let value = value.trim();
+
+                if !key.is_empty() && !value.is_empty() {
+                    details.insert(key.to_string(), value.to_string());
+                }
+            }
+        }
+
+        {
+            let mut cache = crate::managers::DETAILS_CACHE.lock().unwrap();
+            cache.insert(pkg.to_string(), details.clone());
+        }
+
+        Some(details)
+    }
+
+    fn install(
+        &self,
+        terminal: &mut DefaultTerminal,
+        pkgs: &HashSet<String>,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        for pkg in pkgs {
+            crate::execute_external_command(terminal, "flatpak", &["install", "-y", pkg])?;
+        }
+
+        Ok(())
+    }
+
+    fn remove(
+        &self,
+        terminal: &mut DefaultTerminal,
+        pkgs: &HashSet<String>,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        for pkg in pkgs {
+            crate::execute_external_command(terminal, "flatpak", &["uninstall", "-y", pkg])?;
+        }
+
+        Ok(())
+    }
+
+    fn update_packages(
+        &self,
+        terminal: &mut DefaultTerminal,
+        pkgs: &HashSet<String>,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        for pkg in pkgs {
+            crate::execute_external_command(terminal, "flatpak", &["update", "-y", pkg])?;
+        }
+
+        Ok(())
+    }
+
+    fn system_upgrade(
+        &self,
+        terminal: &mut DefaultTerminal,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        crate::execute_external_command(terminal, "flatpak", &["update", "-y"])?;
+        Ok(())
+    }
+
+    fn refresh_databases(
+        &self,
+        terminal: &mut DefaultTerminal,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        crate::execute_external_command(terminal, "flatpak", &["update", "--appstream"])?;
+        Ok(())
+    }
+}
diff --git a/src/managers/mod.rs b/src/managers/mod.rs
index 73eded9..97234ec 100644
--- a/src/managers/mod.rs
+++ b/src/managers/mod.rs
@@ -1,6 +1,7 @@
 pub mod apt;
 pub mod arch;
 pub mod brew;
+pub mod flatpak;
 pub mod pacman;
 pub mod yay;
 
@@ -176,6 +177,9 @@ impl PackageManager for CombinedManager {
 pub fn get_available_managers() -> Vec<String> {
     let mut available = Vec::new();
 
+    if std::process::Command::new("flatpak").arg("--version").output().is_ok() {
+        available.push("flatpak".to_string());
+    }
     if std::process::Command::new("pacman").arg("--version").output().is_ok() {
         available.push("pacman".to_string());
         available.push("yay".to_string());
@@ -207,6 +211,10 @@ pub fn get_system_manager(config: &crate::config::Config) -> Box<dyn PackageMana
         managers.push(Box::new(arch::ArchManager::new(config.aur_helper.clone())));
     }
 
+    if available.contains(&"flatpak".to_string()) && enabled.contains(&"flatpak".to_string()) {
+        managers.push(Box::new(flatpak::FlatpakManager));
+    }
+
     if available.contains(&"apt".to_string()) && enabled.contains(&"apt".to_string()) {
         managers.push(Box::new(apt::AptManager));
     }
@@ -215,6 +223,9 @@ pub fn get_system_manager(config: &crate::config::Config) -> Box<dyn PackageMana
         if available.contains(&"pacman".to_string()) {
             return Box::new(arch::ArchManager::new(config.aur_helper.clone()));
         }
+        if available.contains(&"flatpak".to_string()) {
+            return Box::new(flatpak::FlatpakManager);
+        }
         return Box::new(apt::AptManager);
     }