diff --git a/pcbnew/tools/pcb_selection_tool.cpp b/pcbnew/tools/pcb_selection_tool.cpp
index 4d7196bd78..6388dfa23f 100644
--- a/pcbnew/tools/pcb_selection_tool.cpp
+++ b/pcbnew/tools/pcb_selection_tool.cpp
@@ -354,6 +354,13 @@ int PCB_SELECTION_TOOL::Main( const TOOL_EVENT& aEvent )
         {
             m_disambiguateTimer.Stop();
 
+            // Double clicks make no sense in the footprint viewer
+            if( frame && frame->IsType( FRAME_FOOTPRINT_VIEWER ) )
+            {
+                evt->SetPassEvent();
+                continue;
+            }
+
             // Double click? Display the properties window
             m_frame->FocusOnItem( nullptr );
 
diff --git a/pcbnew/tools/pcb_selection_tool.h b/pcbnew/tools/pcb_selection_tool.h
index c9efce4cf1..33e86566c9 100644
--- a/pcbnew/tools/pcb_selection_tool.h
+++ b/pcbnew/tools/pcb_selection_tool.h
@@ -232,7 +232,12 @@ protected:
         return getViewControls();
     }
 
-    PCB_BASE_EDIT_FRAME* frame() const
+    PCB_BASE_FRAME* frame() const
+    {
+        return getEditFrame<PCB_BASE_FRAME>();
+    }
+
+    PCB_BASE_EDIT_FRAME* editFrame() const
     {
         return getEditFrame<PCB_BASE_EDIT_FRAME>();
     }