diff --git a/app/panel/audiomonitor/audiomonitor.cpp b/app/panel/audiomonitor/audiomonitor.cpp
index 0d92260a3..d15db07b0 100644
--- a/app/panel/audiomonitor/audiomonitor.cpp
+++ b/app/panel/audiomonitor/audiomonitor.cpp
@@ -23,11 +23,8 @@
 OLIVE_NAMESPACE_ENTER
 
 AudioMonitorPanel::AudioMonitorPanel(QWidget *parent) :
-  PanelWidget(parent)
+  PanelWidget(QStringLiteral("AudioMonitor"), parent)
 {
-  // FIXME: This won't work if there's ever more than one of this panel
-  setObjectName("AudioMonitor");
-
   audio_monitor_ = new AudioMonitor(this);
 
   setWidget(audio_monitor_);
diff --git a/app/panel/curve/curve.cpp b/app/panel/curve/curve.cpp
index a8bba6745..d67972a7e 100644
--- a/app/panel/curve/curve.cpp
+++ b/app/panel/curve/curve.cpp
@@ -23,11 +23,8 @@
 OLIVE_NAMESPACE_ENTER
 
 CurvePanel::CurvePanel(QWidget *parent) :
-  TimeBasedPanel(parent)
+  TimeBasedPanel(QStringLiteral("CurvePanel"), parent)
 {
-  // FIXME: This won't work if there's ever more than one of this panel
-  setObjectName("CurvePanel");
-
   // Create main widget and set it
   SetTimeBasedWidget(new CurveWidget());
 
diff --git a/app/panel/footageviewer/footageviewer.cpp b/app/panel/footageviewer/footageviewer.cpp
index 2f35ea460..2ba54ff7c 100644
--- a/app/panel/footageviewer/footageviewer.cpp
+++ b/app/panel/footageviewer/footageviewer.cpp
@@ -25,11 +25,8 @@
 OLIVE_NAMESPACE_ENTER
 
 FootageViewerPanel::FootageViewerPanel(QWidget *parent) :
-  ViewerPanelBase(parent)
+  ViewerPanelBase(QStringLiteral("FootageViewerPanel"), parent)
 {
-  // FIXME: This won't work if there's ever more than one of this panel
-  setObjectName("FootageViewerPanel");
-
   // Set ViewerWidget as the central widget
   SetTimeBasedWidget(new FootageViewerWidget());
 
diff --git a/app/panel/node/node.cpp b/app/panel/node/node.cpp
index 18dd0a84d..a0e4664d8 100644
--- a/app/panel/node/node.cpp
+++ b/app/panel/node/node.cpp
@@ -23,11 +23,8 @@
 OLIVE_NAMESPACE_ENTER
 
 NodePanel::NodePanel(QWidget *parent) :
-  PanelWidget(parent)
+  PanelWidget(QStringLiteral("NodePanel"), parent)
 {
-  // FIXME: This won't work if there's ever more than one of this panel
-  setObjectName("NodePanel");
-
   // Create NodeView widget
   node_view_ = new NodeView(this);
 
diff --git a/app/panel/param/param.cpp b/app/panel/param/param.cpp
index 24ebc1ea6..e714f8d05 100644
--- a/app/panel/param/param.cpp
+++ b/app/panel/param/param.cpp
@@ -23,11 +23,8 @@
 OLIVE_NAMESPACE_ENTER
 
 ParamPanel::ParamPanel(QWidget* parent) :
-  TimeBasedPanel(parent)
+  TimeBasedPanel(QStringLiteral("ParamPanel"), parent)
 {
-  // FIXME: This won't work if there's ever more than one of this panel
-  setObjectName("ParamPanel");
-
   NodeParamView* view = new NodeParamView();
   connect(view, &NodeParamView::SelectedInputChanged, this, &ParamPanel::SelectedInputChanged);
   connect(view, &NodeParamView::TimeTargetChanged, this, &ParamPanel::TimeTargetChanged);
diff --git a/app/panel/pixelsampler/pixelsamplerpanel.cpp b/app/panel/pixelsampler/pixelsamplerpanel.cpp
index d84f2f154..7e3a9d565 100644
--- a/app/panel/pixelsampler/pixelsamplerpanel.cpp
+++ b/app/panel/pixelsampler/pixelsamplerpanel.cpp
@@ -23,11 +23,8 @@
 OLIVE_NAMESPACE_ENTER
 
 PixelSamplerPanel::PixelSamplerPanel(QWidget *parent) :
-  PanelWidget(parent)
+  PanelWidget(QStringLiteral("ProjectPanel"), parent)
 {
-  // FIXME: This won't work if there's ever more than one of this panel
-  setObjectName("ProjectPanel");
-
   sampler_widget_ = new ManagedPixelSamplerWidget();
   setWidget(sampler_widget_);
 
diff --git a/app/panel/project/project.cpp b/app/panel/project/project.cpp
index 3f00211a3..5949ca1e3 100644
--- a/app/panel/project/project.cpp
+++ b/app/panel/project/project.cpp
@@ -35,11 +35,8 @@
 OLIVE_NAMESPACE_ENTER
 
 ProjectPanel::ProjectPanel(QWidget *parent) :
-  PanelWidget(parent)
+  PanelWidget(QStringLiteral("ProjectPanel"), parent)
 {
-  // FIXME: This won't work if there's ever more than one of this panel
-  setObjectName("ProjectPanel");
-
   // Create main widget and its layout
   QWidget* central_widget = new QWidget(this);
   QVBoxLayout* layout = new QVBoxLayout(central_widget);
diff --git a/app/panel/sequenceviewer/sequenceviewer.cpp b/app/panel/sequenceviewer/sequenceviewer.cpp
index 0c4ad6fcf..6712a99eb 100644
--- a/app/panel/sequenceviewer/sequenceviewer.cpp
+++ b/app/panel/sequenceviewer/sequenceviewer.cpp
@@ -23,11 +23,8 @@
 OLIVE_NAMESPACE_ENTER
 
 SequenceViewerPanel::SequenceViewerPanel(QWidget *parent) :
-  ViewerPanel(parent)
+  ViewerPanel(QStringLiteral("SequenceViewerPanel"), parent)
 {
-  // FIXME: This won't work if there's ever more than one of this panel
-  setObjectName("SequenceViewerPanel");
-
   // Set strings
   Retranslate();
 }
diff --git a/app/panel/taskmanager/taskmanager.cpp b/app/panel/taskmanager/taskmanager.cpp
index 0df94775e..542651792 100644
--- a/app/panel/taskmanager/taskmanager.cpp
+++ b/app/panel/taskmanager/taskmanager.cpp
@@ -25,11 +25,8 @@
 OLIVE_NAMESPACE_ENTER
 
 TaskManagerPanel::TaskManagerPanel(QWidget* parent) :
-  PanelWidget(parent)
+  PanelWidget(QStringLiteral("TaskManagerPanel"), parent)
 {
-  // FIXME: This won't work if there's ever more than one of this panel
-  setObjectName("TaskManagerPanel");
-
   // Create task view
   view_ = new TaskView(this);
 
diff --git a/app/panel/timebased/timebased.cpp b/app/panel/timebased/timebased.cpp
index 7918dab60..e35628800 100644
--- a/app/panel/timebased/timebased.cpp
+++ b/app/panel/timebased/timebased.cpp
@@ -22,8 +22,8 @@
 
 OLIVE_NAMESPACE_ENTER
 
-TimeBasedPanel::TimeBasedPanel(QWidget *parent) :
-  PanelWidget(parent),
+TimeBasedPanel::TimeBasedPanel(const QString &object_name, QWidget *parent) :
+  PanelWidget(object_name, parent),
   widget_(nullptr)
 {
 }
diff --git a/app/panel/timebased/timebased.h b/app/panel/timebased/timebased.h
index 5d04ef23b..a47a4ea18 100644
--- a/app/panel/timebased/timebased.h
+++ b/app/panel/timebased/timebased.h
@@ -30,7 +30,7 @@ class TimeBasedPanel : public PanelWidget
 {
   Q_OBJECT
 public:
-  TimeBasedPanel(QWidget *parent = nullptr);
+  TimeBasedPanel(const QString& object_name, QWidget *parent = nullptr);
 
   void ConnectViewerNode(ViewerOutput* node);
 
diff --git a/app/panel/timeline/timeline.cpp b/app/panel/timeline/timeline.cpp
index f701d3267..4b42ea3f7 100644
--- a/app/panel/timeline/timeline.cpp
+++ b/app/panel/timeline/timeline.cpp
@@ -26,11 +26,8 @@
 OLIVE_NAMESPACE_ENTER
 
 TimelinePanel::TimelinePanel(QWidget *parent) :
-  TimeBasedPanel(parent)
+  TimeBasedPanel(QStringLiteral("TimelinePanel"), parent)
 {
-  // FIXME: This won't work if there's ever more than one of this panel
-  setObjectName("TimelinePanel");
-
   TimelineWidget* tw = new TimelineWidget();
   SetTimeBasedWidget(tw);
 
diff --git a/app/panel/tool/tool.cpp b/app/panel/tool/tool.cpp
index a596df50d..e9dce4b7c 100644
--- a/app/panel/tool/tool.cpp
+++ b/app/panel/tool/tool.cpp
@@ -26,11 +26,8 @@
 OLIVE_NAMESPACE_ENTER
 
 ToolPanel::ToolPanel(QWidget *parent) :
-  PanelWidget(parent)
+  PanelWidget(QStringLiteral("ToolPanel"), parent)
 {
-  // FIXME: This won't work if there's ever more than one of this panel
-  setObjectName("ToolPanel");
-
   Toolbar* t = new Toolbar(this);
 
   t->SetTool(Core::instance()->tool());
diff --git a/app/panel/viewer/viewer.cpp b/app/panel/viewer/viewer.cpp
index 122c45ddc..b45a14981 100644
--- a/app/panel/viewer/viewer.cpp
+++ b/app/panel/viewer/viewer.cpp
@@ -22,12 +22,9 @@
 
 OLIVE_NAMESPACE_ENTER
 
-ViewerPanel::ViewerPanel(QWidget *parent) :
-  ViewerPanelBase(parent)
+ViewerPanel::ViewerPanel(const QString &object_name, QWidget *parent) :
+  ViewerPanelBase(object_name, parent)
 {
-  // FIXME: This won't work if there's ever more than one of this panel
-  setObjectName("ViewerPanel");
-
   // Set ViewerWidget as the central widget
   SetTimeBasedWidget(new ViewerWidget());
 
diff --git a/app/panel/viewer/viewer.h b/app/panel/viewer/viewer.h
index 80121a5cb..4e35444e2 100644
--- a/app/panel/viewer/viewer.h
+++ b/app/panel/viewer/viewer.h
@@ -33,7 +33,7 @@ OLIVE_NAMESPACE_ENTER
 class ViewerPanel : public ViewerPanelBase {
   Q_OBJECT
 public:
-  ViewerPanel(QWidget* parent);
+  ViewerPanel(const QString& object_name, QWidget* parent);
 
 protected:
   virtual void Retranslate() override;
diff --git a/app/panel/viewer/viewerbase.cpp b/app/panel/viewer/viewerbase.cpp
index aa98518c6..85597a659 100644
--- a/app/panel/viewer/viewerbase.cpp
+++ b/app/panel/viewer/viewerbase.cpp
@@ -22,8 +22,8 @@
 
 OLIVE_NAMESPACE_ENTER
 
-ViewerPanelBase::ViewerPanelBase(QWidget *parent) :
-  TimeBasedPanel(parent)
+ViewerPanelBase::ViewerPanelBase(const QString& object_name, QWidget *parent) :
+  TimeBasedPanel(object_name, parent)
 {
 }
 
diff --git a/app/panel/viewer/viewerbase.h b/app/panel/viewer/viewerbase.h
index 9a0555844..d9906a9f8 100644
--- a/app/panel/viewer/viewerbase.h
+++ b/app/panel/viewer/viewerbase.h
@@ -31,7 +31,7 @@ class ViewerPanelBase : public TimeBasedPanel
 {
   Q_OBJECT
 public:
-  ViewerPanelBase(QWidget* parent = nullptr);
+  ViewerPanelBase(const QString& object_name, QWidget* parent = nullptr);
 
   virtual void PlayPause() override;
 
diff --git a/app/widget/panel/panel.cpp b/app/widget/panel/panel.cpp
index d73dc02db..d44452b56 100644
--- a/app/widget/panel/panel.cpp
+++ b/app/widget/panel/panel.cpp
@@ -29,11 +29,12 @@
 
 OLIVE_NAMESPACE_ENTER
 
-PanelWidget::PanelWidget(QWidget *parent) :
+PanelWidget::PanelWidget(const QString &object_name, QWidget *parent) :
   QDockWidget(parent),
   border_visible_(false),
   signal_instead_of_close_(false)
 {
+  setObjectName(object_name);
   setFocusPolicy(Qt::ClickFocus);
 
   connect(this, &PanelWidget::visibilityChanged, this, &PanelWidget::PanelVisibilityChanged);
diff --git a/app/widget/panel/panel.h b/app/widget/panel/panel.h
index 93409bf69..1eaa76367 100644
--- a/app/widget/panel/panel.h
+++ b/app/widget/panel/panel.h
@@ -42,7 +42,7 @@ public:
    * The PanelWidget's parent, enforced to help with memory handling. Most of the time this will be an instance of
    * MainWindow.
    */
-  PanelWidget(QWidget* parent);
+  PanelWidget(const QString& object_name, QWidget* parent);
 
   /**
    * @brief Set whether panel movement is locked or not