diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs
index ea4ae72e1..c79100fc5 100644
--- a/Flow.Launcher.Core/Plugin/PluginManager.cs
+++ b/Flow.Launcher.Core/Plugin/PluginManager.cs
@@ -301,7 +301,14 @@ namespace Flow.Launcher.Core.Plugin
                 return Array.Empty<PluginPair>();
 
             if (!NonGlobalPlugins.TryGetValue(query.ActionKeyword, out var plugin))
-                return GlobalPlugins;
+            {
+                return GlobalPlugins.Where(p => !PluginModified(p.Metadata.ID)).ToList();
+            }
+
+            if (API.PluginModified(plugin.Metadata.ID))
+            {
+                return Array.Empty<PluginPair>();
+            }
 
             return new List<PluginPair>
             {
@@ -311,7 +318,7 @@ namespace Flow.Launcher.Core.Plugin
 
         public static ICollection<PluginPair> ValidPluginsForHomeQuery()
         {
-            return _homePlugins.ToList();
+            return _homePlugins.Where(p => !PluginModified(p.Metadata.ID)).ToList();
         }
 
         public static async Task<List<Result>> QueryForPluginAsync(PluginPair pair, Query query, CancellationToken token)
@@ -657,9 +664,9 @@ namespace Flow.Launcher.Core.Plugin
             InstallPlugin(plugin, zipFilePath, checkModified: true);
         }
 
-        public static async Task UninstallPluginAsync(PluginMetadata plugin, bool removePluginFromSettings = true, bool removePluginSettings = false)
+        public static async Task UninstallPluginAsync(PluginMetadata plugin, bool removePluginSettings = false)
         {
-            await UninstallPluginAsync(plugin, removePluginFromSettings, removePluginSettings, true);
+            await UninstallPluginAsync(plugin, removePluginFromSettings: true, removePluginSettings: removePluginSettings, checkModified: true);
         }
 
         #endregion
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
index e200a187f..0daa36e63 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
@@ -8,10 +8,7 @@
     d:DesignHeight="300"
     d:DesignWidth="300"
     mc:Ignorable="d">
-    <Grid
-        x:Name="PreviewGrid"
-        Margin="0 0 0 0"
-        VerticalAlignment="Stretch">
+    <Grid x:Name="PreviewGrid" VerticalAlignment="Stretch">
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition Height="Auto" />
@@ -47,7 +44,7 @@
                     TextWrapping="Wrap" />
             </Grid>
         </Grid>
-        <StackPanel Grid.Row="2">
+        <StackPanel Grid.Row="1">
             <StackPanel.Style>
                 <Style TargetType="StackPanel">
                     <Style.Triggers>
@@ -90,78 +87,76 @@
                     </Style>
                 </Rectangle.Style>
             </Rectangle>
-            <StackPanel Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
-                <Grid Margin="0 10 0 10">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="100" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Margin="5 0 0 0"
-                        VerticalAlignment="Top"
-                        Style="{DynamicResource PreviewItemSubTitleStyle}"
-                        Text="{DynamicResource FileSize}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="1"
-                        Margin="0 0 13 0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        Style="{DynamicResource PreviewItemSubTitleStyle}"
-                        Text="{Binding FileSize, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}, Mode=OneWay}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
+            <Grid Margin="0 10 0 0" Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="100" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <TextBlock
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Margin="5 0 0 0"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemSubTitleStyle}"
+                    Text="{DynamicResource FileSize}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
+                <TextBlock
+                    Grid.Row="0"
+                    Grid.Column="1"
+                    Margin="0 0 13 0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemSubTitleStyle}"
+                    Text="{Binding FileSize, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}, Mode=OneWay}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
 
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Margin="5 0 8 0"
-                        VerticalAlignment="Top"
-                        Style="{DynamicResource PreviewItemSubTitleStyle}"
-                        Text="{DynamicResource Created}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        Margin="0 0 13 0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        Style="{DynamicResource PreviewItemSubTitleStyle}"
-                        Text="{Binding CreatedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
+                <TextBlock
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Margin="5 0 8 0"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemSubTitleStyle}"
+                    Text="{DynamicResource Created}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
+                <TextBlock
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Margin="0 0 13 0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemSubTitleStyle}"
+                    Text="{Binding CreatedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
 
-                    <TextBlock
-                        Grid.Row="2"
-                        Grid.Column="0"
-                        Margin="5 0 8 0"
-                        VerticalAlignment="Top"
-                        Style="{DynamicResource PreviewItemSubTitleStyle}"
-                        Text="{DynamicResource LastModified}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
-                    <TextBlock
-                        Grid.Row="2"
-                        Grid.Column="1"
-                        Margin="0 0 13 0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        Style="{DynamicResource PreviewItemSubTitleStyle}"
-                        Text="{Binding LastModifiedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
-                </Grid>
-            </StackPanel>
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="0"
+                    Margin="5 0 8 0"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemSubTitleStyle}"
+                    Text="{DynamicResource LastModified}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="0 0 13 0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemSubTitleStyle}"
+                    Text="{Binding LastModifiedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
+            </Grid>
         </StackPanel>
     </Grid>
 </UserControl>