diff --git a/samples/ControlCatalog/Pages/DragAndDropPage.xaml b/samples/ControlCatalog/Pages/DragAndDropPage.xaml
index 7982ddc1d0..9b4290ad04 100644
--- a/samples/ControlCatalog/Pages/DragAndDropPage.xaml
+++ b/samples/ControlCatalog/Pages/DragAndDropPage.xaml
@@ -43,14 +43,14 @@
                 MaxWidth="260"
                 Background="{DynamicResource SystemAccentColorDark1}"
                 DragDrop.AllowDrop="True">
-          <TextBlock TextWrapping="Wrap">Drop some text or files here (Copy)</TextBlock>
+          <TextBlock TextWrapping="Wrap">Drop some text, files, bitmap or custom format here (Copy)</TextBlock>
         </Border>
         <Border Name="MoveTarget"
                 Padding="16"
                 MaxWidth="260"
                 Background="{DynamicResource SystemAccentColorDark1}"
                 DragDrop.AllowDrop="True">
-          <TextBlock TextWrapping="Wrap">Drop some text or files here (Move)</TextBlock>
+          <TextBlock TextWrapping="Wrap">Drop some text or custom format here (Move)</TextBlock>
         </Border>
       </StackPanel>
     </WrapPanel>
diff --git a/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs b/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
index fe2b306477..fad63dd512 100644
--- a/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
@@ -124,6 +124,9 @@ namespace ControlCatalog.Pages
                     e.DragEffects = e.DragEffects & (DragDropEffects.Copy);
                 }
 
+                if (e.DragEffects == DragDropEffects.None)
+                    return;
+
                 if (e.DataTransfer.Contains(DataFormat.Text))
                 {
                     DropState.Content = e.DataTransfer.TryGetText();