diff --git a/objectpropertiesframe.ui b/eventpropertiesframe.ui
similarity index 100%
rename from objectpropertiesframe.ui
rename to eventpropertiesframe.ui
diff --git a/mainwindow.cpp b/mainwindow.cpp
index b1d8f4b5..af9d9992 100755
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2,7 +2,7 @@
 #include "ui_mainwindow.h"
 #include "project.h"
 #include "editor.h"
-#include "objectpropertiesframe.h"
+#include "eventpropertiesframe.h"
 #include "ui_objectpropertiesframe.h"
 
 #include <QDebug>
@@ -695,10 +695,10 @@ void MainWindow::updateSelectedObjects() {
 
     QMap<QString, int> event_obj_gfx_constants = editor->project->getEventObjGfxConstants();
 
-    QList<ObjectPropertiesFrame *> frames;
+    QList<EventPropertiesFrame *> frames;
 
     for (DraggablePixmapItem *item : *events) {
-        ObjectPropertiesFrame *frame = new ObjectPropertiesFrame;
+        EventPropertiesFrame *frame = new EventPropertiesFrame;
 //        frame->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
 
         QSpinBox *x = frame->ui->spinBox_x;
@@ -925,7 +925,7 @@ void MainWindow::updateSelectedObjects() {
     ui->scrollArea_4->setWidgetResizable(true);
     ui->scrollArea_4->setWidget(target);
 
-    for (ObjectPropertiesFrame *frame : frames) {
+    for (EventPropertiesFrame *frame : frames) {
         layout->addWidget(frame);
     }
 
diff --git a/objectpropertiesframe.cpp b/objectpropertiesframe.cpp
deleted file mode 100755
index 09e71ffa..00000000
--- a/objectpropertiesframe.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "objectpropertiesframe.h"
-#include "ui_objectpropertiesframe.h"
-
-ObjectPropertiesFrame::ObjectPropertiesFrame(QWidget *parent) :
-    QFrame(parent),
-    ui(new Ui::ObjectPropertiesFrame)
-{
-    ui->setupUi(this);
-}
-
-ObjectPropertiesFrame::~ObjectPropertiesFrame()
-{
-    delete ui;
-}
diff --git a/porymap.pro b/porymap.pro
index 44216411..1e7d54e1 100755
--- a/porymap.pro
+++ b/porymap.pro
@@ -22,6 +22,7 @@ SOURCES += core/block.cpp \
     core/metatile.cpp \
     core/tile.cpp \
     core/tileset.cpp \
+    ui/eventpropertiesframe.cpp \
     ui/metatileselector.cpp \
     ui/movementpermissionsselector.cpp \
     ui/neweventtoolbutton.cpp \
@@ -34,7 +35,6 @@ SOURCES += core/block.cpp \
     main.cpp \
     mainwindow.cpp \
     map.cpp \
-    objectpropertiesframe.cpp \
     parseutil.cpp \
     project.cpp
 
@@ -48,6 +48,7 @@ HEADERS  += core/block.h \
     core/metatile.h \
     core/tile.h \
     core/tileset.h \
+    ui/eventpropertiesframe.h \
     ui/metatileselector.h \
     ui/movementpermissionsselector.h \
     ui/neweventtoolbutton.h \
@@ -59,12 +60,11 @@ HEADERS  += core/block.h \
     graphicsview.h \
     mainwindow.h \
     map.h \
-    objectpropertiesframe.h \
     parseutil.h \
     project.h
 
 FORMS    += mainwindow.ui \
-    objectpropertiesframe.ui
+    eventpropertiesframe.ui
 
 RESOURCES += \
     resources/images.qrc
diff --git a/ui/eventpropertiesframe.cpp b/ui/eventpropertiesframe.cpp
new file mode 100644
index 00000000..e4c0f097
--- /dev/null
+++ b/ui/eventpropertiesframe.cpp
@@ -0,0 +1,14 @@
+#include "eventpropertiesframe.h"
+#include "ui_objectpropertiesframe.h"
+
+EventPropertiesFrame::EventPropertiesFrame(QWidget *parent) :
+    QFrame(parent),
+    ui(new Ui::ObjectPropertiesFrame)
+{
+    ui->setupUi(this);
+}
+
+EventPropertiesFrame::~EventPropertiesFrame()
+{
+    delete ui;
+}
diff --git a/objectpropertiesframe.h b/ui/eventpropertiesframe.h
old mode 100755
new mode 100644
similarity index 59%
rename from objectpropertiesframe.h
rename to ui/eventpropertiesframe.h
index 63a23bb0..13c4aee7
--- a/objectpropertiesframe.h
+++ b/ui/eventpropertiesframe.h
@@ -1,22 +1,22 @@
-#ifndef OBJECTPROPERTIESFRAME_H
-#define OBJECTPROPERTIESFRAME_H
-
-#include <QFrame>
-
-namespace Ui {
-class ObjectPropertiesFrame;
-}
-
-class ObjectPropertiesFrame : public QFrame
-{
-    Q_OBJECT
-
-public:
-    explicit ObjectPropertiesFrame(QWidget *parent = nullptr);
-    ~ObjectPropertiesFrame();
-
-public:
-    Ui::ObjectPropertiesFrame *ui;
-};
-
-#endif // OBJECTPROPERTIESFRAME_H
+#ifndef OBJECTPROPERTIESFRAME_H
+#define OBJECTPROPERTIESFRAME_H
+
+#include <QFrame>
+
+namespace Ui {
+class ObjectPropertiesFrame;
+}
+
+class EventPropertiesFrame : public QFrame
+{
+    Q_OBJECT
+
+public:
+    explicit EventPropertiesFrame(QWidget *parent = nullptr);
+    ~EventPropertiesFrame();
+
+public:
+    Ui::ObjectPropertiesFrame *ui;
+};
+
+#endif // OBJECTPROPERTIESFRAME_H